From 809b68d15efe4dbc20f2eb28639606529743652d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 15 九月 2023 16:34:06 +0800
Subject: [PATCH] zjh 2023/09/15---2
---
ltkj-admin/src/test/java/zjhTest.java | 45
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 1423 ++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 11
ltkj-common/src/main/java/com/ltkj/common/core/redis/RedisCache.java | 12
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java | 2680 +++++++++++++++++++------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java | 5
7 files changed, 2,855 insertions(+), 1,322 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
new file mode 100644
index 0000000..f241401
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -0,0 +1,1423 @@
+package com.ltkj.web.controller.service;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysUser;
+import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.utils.StringUtils;
+import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.vodomain.AddNewReservationConfirm;
+import com.ltkj.hosp.vodomain.QjDomainVo;
+import com.ltkj.mall.mallOrderUtils.TjConstants;
+import com.ltkj.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+ * @Author: zjh
+ * @Date: 2023/9/15 15:57
+ */
+
+@Service
+@Transactional
+public class TjSysAsyncServiceImpl implements TjAsyncService {
+ @Resource
+ private ITjProjectService projectService;
+ @Resource
+ private ITjCustomerService tjCustomerService;
+ @Resource
+ private ITbTransitionService transitionService;
+ @Resource
+ private ITjOrderDetailService tjOrderDetailService;
+ @Resource
+ private ITjOrderRemarkService orderRemarkService;
+ @Resource
+ private ITjChargingStandardService chargingStandardService;
+ @Resource
+ private TjProConsumablesService proConsumablesService;
+ @Resource
+ private ITjConsumablesService consumablesService;
+ @Resource
+ private ITjDiscardInspectionService discardInspectionService;
+ @Resource
+ private ITjPackageService tjPackageService;
+ @Resource
+ private RedisCache redisCache;
+ @Resource
+ private ITjOrderService orderService;
+ @Resource
+ private IDictCompService compService;
+ @Resource
+ private ITjSamplingService samplingService;
+ @Resource
+ private ITjSamplingService tjSamplingService;
+ @Resource
+ private ITjPackageProjectService ppservice;
+ @Resource
+ private TjYqOrderService yqOrderService;
+ @Autowired
+ private ITjAskMedicalHistoryService tjAskMedicalHistoryService;
+ @Autowired
+ private ITjGroupingProService groupingProService;
+ @Resource
+ private ITjStandardService tjStandardService;
+ @Resource
+ private ITjAdviceService tjAdviceService;
+ @Resource
+ private ISysUserService userService;
+
+
+ @Override
+ public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
+ long l = System.currentTimeMillis();
+
+ LambdaQueryWrapper<TjAskMedicalHistory> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjAskMedicalHistory::getCusId,tjCustomer.getCusId());
+ wq.isNull(TjAskMedicalHistory::getTjNum);
+ TjAskMedicalHistory history = tjAskMedicalHistoryService.getOne(wq);
+ if(null !=history){
+ history.setTjNum(tjOrder.getTjNumber());
+ tjAskMedicalHistoryService.updateById(history);
+ }
+
+ List<TbTransition> tbTransitionList =null;
+ if (redisCache.hasKey(tjCustomer.getCusIdcard())) {
+ tbTransitionList = redisCache.getCacheList(tjCustomer.getCusIdcard());
+ redisCache.deleteObject(tjCustomer.getCusIdcard());
+ }else {
+ LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TbTransition::getCusId, tjCustomer.getCusIdcard());
+ tbTransitionList = transitionService.list(wqq);
+ }
+ if (redisCache.hasKey(tjCustomer.getCusIdcard() + "cusId"))
+ redisCache.deleteObject(tjCustomer.getCusIdcard() + "cusId");
+ if (null != tbTransitionList && tbTransitionList.size() > 0) {
+
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),String.valueOf(tjOrder.getOrderId()),sysUser.getNickName(),String.valueOf(sysUser.getUserId()));
+
+ //淇敼姣忛」鐨勫師浠风幇浠�
+ for (TbTransition transition : tbTransitionList) {
+ transition.setOrdPrice(transition.getNowPrice());
+ transition.setNowPrice(transition.getNowPrice().multiply(discount));
+ transitionService.updateById(transition);
+ }
+ }
+ LambdaQueryWrapper<TjOrderDetail> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ List<TjOrderDetail> list = tjOrderDetailService.list(wrapper1);
+ if (list != null && list.size()>0) {
+ for (TjOrderDetail tjOrderDetail : list) {
+ TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
+ if(tjProject==null){
+ continue;
+ }
+ tjOrderDetail.setProject(tjProject);
+ if (tjProject.getProParentId() == 0) {
+ TjOrderRemark tjOrderRemark = new TjOrderRemark();
+ tjOrderRemark.setProId(tjProject.getProId());
+ tjOrderRemark.setProName(tjProject.getProName());
+ tjOrderRemark.setDeptId(tjProject.getDeptId());
+ tjOrderRemark.setTjNumber(tjOrder.getTjNumber());
+ tjOrderRemark.setCreateBy(sysUser.getNickName());
+ tjOrderRemark.setCreateTime(new Date());
+ tjOrderRemark.setUpdateBy(sysUser.getNickName());
+ tjOrderRemark.setUpdateTime(new Date());
+ tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ orderRemarkService.save(tjOrderRemark);
+ }
+ if ("1".equals(tjOrder.getTjType())) {
+ if (null != tjReservation && tjReservation.getPayType() == 1) {
+ tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }
+ }
+ if(tjFlowingWater.getPayStasus()==1){
+ tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }
+ tjOrderDetailService.updateById(tjOrderDetail);
+ }
+ }
+ System.out.println("杩欐浠ｇ爜鏃堕棿"+(l-System.currentTimeMillis()));
+ }
+
+ @Override
+ @Async("async")
+ public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer,SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
+
+ tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
+
+ boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ if (!b){
+ List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjOrder.getGroupId()));
+ if(null !=proList && proList.size()>0){
+ for (TjGroupingPro groupingPro : proList) {
+ TjOrderDetail detail = new TjOrderDetail();
+// if (null != transition.getPacId()) {
+// detail.setProType(String.valueOf(transition.getPacId()));
+// }
+ TjProject tjProject = projectService.selectTjProjectByProId(Long.valueOf(groupingPro.getProId()));
+ detail.setIsSampling(String.valueOf(tjProject.getIsSampling()));
+ detail.setOrderId(tjOrder.getOrderId());
+ detail.setProId(Long.valueOf(groupingPro.getProId()));
+ detail.setTjStatus(0L);
+ detail.setCreateBy(sysUser.getNickName());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.save(detail);
+ }
+ List<String> list = proList.stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
+ List<TjProject> projectList = projectService.list(new LambdaQueryWrapper<TjProject>().in(TjProject::getProParentId, list));
+ for (TjProject project : projectList) {
+ TjOrderDetail detail = new TjOrderDetail();
+ detail.setOrderId(tjOrder.getOrderId());
+ detail.setProId(project.getProId());
+ detail.setTjStatus(0L);
+ detail.setCreateBy(sysUser.getNickName());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ //鑾峰彇璇ラ」鐩殑榛樿鍊艰祴鍊肩粰缁撴灉
+ if(null !=project.getProDefault()){
+ detail.setProResult(project.getProDefault());
+ }else {
+ detail.setProResult(null);
+ }
+ detail.setIsSampling(String.valueOf(project.getIsSampling()));
+
+ tjOrderDetailService.save(detail);
+ }
+ }
+ }
+
+ //娣诲姞remark琛ㄦ暟鎹�
+ orderRemarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ //鍒ゆ柇鏄惁浜ら挶
+ if ("1".equals(tjOrder.getTjType())) {
+ if (null != tjReservation && tjReservation.getPayType() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }
+ }
+ if (tjFlowingWater.getPayStasus() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }
+
+// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
+// if (list != null) {
+// for (TjOrderDetail tjOrderDetail : list) {
+// TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
+// if(tjProject==null){
+// continue;
+// }
+// tjOrderDetail.setProject(tjProject);
+// if (tjProject.getProParentId() == 0) {
+// TjOrderRemark tjOrderRemark = new TjOrderRemark();
+// tjOrderRemark.setProId(tjProject.getProId());
+// tjOrderRemark.setProName(tjProject.getProName());
+// tjOrderRemark.setDeptId(tjProject.getDeptId());
+// tjOrderRemark.setTjNumber(tjOrder.getTjNumber());
+// tjOrderRemark.setCreateBy(sysUser.getNickName());
+// tjOrderRemark.setCreateTime(new Date());
+// tjOrderRemark.setUpdateBy(sysUser.getNickName());
+// tjOrderRemark.setUpdateTime(new Date());
+// tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+// orderRemarkService.save(tjOrderRemark);
+// }
+// if ("1".equals(tjOrder.getTjType())) {
+// if (null != tjReservation && tjReservation.getPayType() == 1) {
+// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// }
+// }
+// if(tjFlowingWater.getPayStasus()==1){
+// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// }
+// tjOrderDetailService.updateById(tjOrderDetail);
+// }
+// }
+ }
+
+ @Override
+ @Async("async")
+ public void collectFees(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList, SysUser sysUser, String discount) {
+ orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
+ for (TbTransition transition : tbTransitionList) {
+ transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).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(new Date());
+ tjChargingStandard.setUpdateBy(sysUser.getNickName());
+ tjChargingStandard.setUpdateTime(new Date());
+ tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+ chargingStandardService.save(tjChargingStandard);
+ }
+ }
+
+ //鐖堕」
+ ArrayList<TbTransition> collect1 = tbTransitionList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbTransition::getParentProId))), ArrayList::new));
+ List<Long> parentProIds = collect1.stream().map(TbTransition::getParentProId).collect(Collectors.toList());
+ if (parentProIds.size() > 0) {
+ for (Long parentProId : parentProIds) {
+ TjProject parentProject = projectService.selectTjProjectByProId(parentProId);
+ if (null != parentProject) {
+ 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);
+ }
+ }
+ TjOrderRemark tjOrderRemark=new TjOrderRemark();
+ tjOrderRemark.setProId(parentProId);
+ tjOrderRemark.setProName(parentProject.getProName());
+ tjOrderRemark.setDeptId(parentProject.getDeptId());
+ tjOrderRemark.setTjNumber(order.getTjNumber());
+ tjOrderRemark.setCreateBy(sysUser.getNickName());
+ tjOrderRemark.setCreateTime(new Date());
+ tjOrderRemark.setUpdateBy(sysUser.getNickName());
+ tjOrderRemark.setUpdateTime(new Date());
+ tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ orderRemarkService.save(tjOrderRemark);
+ }
+ }
+ }
+
+ ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
+ for (TjConsumables tjConsumables : collect) {
+ TjChargingStandard tjChargingStandard = new TjChargingStandard();
+ tjChargingStandard.setTjNum(order.getTjNumber());
+ tjChargingStandard.setConsumablesId(tjConsumables.getId());
+ tjChargingStandard.setPrice(tjConsumables.getPrice());
+ tjChargingStandard.setProName(tjConsumables.getMakings());
+ tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
+ tjChargingStandard.setCompany(tjConsumables.getSpecifications());
+ tjChargingStandard.setCreateBy(sysUser.getNickName());
+ tjChargingStandard.setCreateTime(new Date());
+ tjChargingStandard.setUpdateBy(sysUser.getNickName());
+ tjChargingStandard.setUpdateTime(new Date());
+ tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+ chargingStandardService.save(tjChargingStandard);
+ }
+
+ LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderDetail::getOrderId,order.getOrderId());
+ 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);
+ }
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void abandonCheck(String tjNumber, TjOrder tjOrder, List<TjOrderDetail> list, SysUser sysUser) {
+ for (TjOrderDetail tjOrderDetail : list) {
+ LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjProject::getProId, tjOrderDetail.getProId());
+ TjProject one = projectService.getOne(wq1);
+ if (one != null) {
+ if (one.getProParentId() != 0) {
+ tjOrderDetail.setTjStatus(2L);
+ tjOrderDetail.setProResult("寮冩");
+ tjOrderDetail.setUpdateTime(new DateTime());
+ tjOrderDetailService.updateById(tjOrderDetail);
+ } else {
+ tjOrderDetail.setTjStatus(1L);
+ tjOrderDetail.setUpdateTime(new DateTime());
+ tjOrderDetailService.updateById(tjOrderDetail);
+ }
+ //缁欏純妫�琛ㄦ坊鍔犺褰�
+ TjDiscardInspection td = new TjDiscardInspection();
+ td.setProId(String.valueOf(one.getProId()));
+ td.setProName(one.getProName());
+ td.setCusId(String.valueOf(tjOrder.getUserId()));
+ td.setCusName((tjCustomerService.getById(tjOrder.getUserId())).getCusName());
+ td.setRegistrationTime(tjOrder.getCreateTime());
+ td.setTjNum(tjNumber);
+ td.setCreateBy(sysUser.getNickName());
+ td.setCreateTime(new DateTime());
+ td.setUpdateBy(sysUser.getNickName());
+ td.setUpdateTime(new DateTime());
+ td.setCreateId(String.valueOf(sysUser.getUserId()));
+ td.setUpdateId(String.valueOf(sysUser.getUserId()));
+ discardInspectionService.save(td);
+ }
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order) {
+ for (TjOrderDetail detail : tjOrderDetailList) {
+ detail.setTjStatus(1L);
+ LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjStandard::getProId, detail.getProId());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.updateById(detail);
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
+ List<TjConsumables> list2 = new ArrayList<>();
+ String[] tjProIds = tjFlowingWater.getTjProIds();
+ for (String tjProId : tjProIds) {
+ TjProject project = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
+ TjOrderRemark tjOrderRemark=new TjOrderRemark();
+ tjOrderRemark.setProId(Long.valueOf(tjProId));
+ tjOrderRemark.setProName(project.getProName());
+ tjOrderRemark.setDeptId(project.getDeptId());
+ tjOrderRemark.setTjNumber(order.getTjNumber());
+ tjOrderRemark.setCreateBy(sysUser.getNickName());
+ tjOrderRemark.setCreateTime(new Date());
+ tjOrderRemark.setUpdateBy(sysUser.getNickName());
+ tjOrderRemark.setUpdateTime(new Date());
+ tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ orderRemarkService.save(tjOrderRemark);
+ 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());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.save(detail);
+ for (Long proId : proIds) {
+ TjOrderDetail detail1 = new TjOrderDetail();
+ detail1.setTjStatus(0L);
+ detail1.setOrderId(tjFlowingWater.getOrderId());
+ detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ detail1.setProId(proId);
+ detail1.setIsAddition("Y");
+ detail.setCreateBy(sysUser.getNickName());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.save(detail1);
+ }
+ LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
+ wqq.in(TbTransition::getProId, proIds);
+ List<TbTransition> tbTransitionList = transitionService.list(wqq);
+ if (null != tbTransitionList && tbTransitionList.size() > 0) {
+ for (TbTransition transition : tbTransitionList) {
+ 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(new Date());
+ tjChargingStandard.setUpdateBy(sysUser.getNickName());
+ tjChargingStandard.setUpdateTime(new Date());
+ tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+ chargingStandardService.save(tjChargingStandard);
+ }
+ }
+ //鐖堕」
+ TjProject parentProject = projectService.getById(tjProId);
+ if (null != parentProject) {
+ 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);
+ }
+ }
+ }
+ }
+ }
+ //鐖堕」鑰楁潗
+ ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
+ for (TjConsumables tjConsumables : collect) {
+ TjChargingStandard tjChargingStandard = new TjChargingStandard();
+ tjChargingStandard.setTjNum(order.getTjNumber());
+ tjChargingStandard.setConsumablesId(tjConsumables.getId());
+ tjChargingStandard.setPrice(tjConsumables.getPrice());
+ tjChargingStandard.setProName(tjConsumables.getMakings());
+ tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
+ tjChargingStandard.setCompany(tjConsumables.getSpecifications());
+ tjChargingStandard.setCreateBy(sysUser.getNickName());
+ tjChargingStandard.setCreateTime(new Date());
+ tjChargingStandard.setUpdateBy(sysUser.getNickName());
+ tjChargingStandard.setUpdateTime(new Date());
+ tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+ chargingStandardService.save(tjChargingStandard);
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void dockerSetCustomerLisByRedis(List<Long> ksproList, String ksId) {
+ List<TjCustomer> yjAjaxResult = getYjAjaxResult(ksproList);
+ List<TjCustomer> wjAjaxResult = getWjAjaxResult(ksproList);
+ redisCache.setCacheMapValue(ksId + "ks", "wj",wjAjaxResult);
+ redisCache.setCacheMapValue(ksId + "ks", "yj",yjAjaxResult);
+ }
+
+ @Override
+ @Async("async")
+ public void checkSetCustomerLisByRedis(String config) {
+ List<TjCustomer> wsResult = getWsResult(config);
+ List<TjCustomer> ysResult = getYsResult(config);
+ redisCache.setCacheMapValue("check", "ws",wsResult);
+ redisCache.setCacheMapValue("check", "ys",ysResult);
+ //鏌ヨ
+ }
+
+ @Override
+ @Async("async")
+ public void wCScheckSetCustomerLisByRedis( List<TjOrder> orderList) {
+ List<TjCustomer> customerList = new ArrayList<>();
+ if(null !=orderList && orderList.size()>0){
+ for (TjOrder tjOrder : orderList) {
+ if (null != tjOrder) {
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ if (customer == null) {
+ continue;
+ }
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjOrder.getTjNumber());
+ customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+ customer.setOrderId(tjOrder.getOrderId());
+ customer.setTjTime(tjOrder.getCreateTime());
+ customer.setFinishTime(tjOrder.getFinishTime());
+ customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+ if (tjOrder.getFirmId() == null) {
+ customer.setTjCompName("鏃�");
+ } else {
+ DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
+ if (byId != null) {
+ customer.setTjCompName(byId.getCnName());
+ }
+ }
+ customerList.add(customer);
+ }
+ }
+ }
+ redisCache.setCacheMapValue("cScheck", "ws",customerList);
+ }
+
+ @Override
+ @Async("async")
+ public void yCScheckSetCustomerLisByRedis( List<TjOrder> orderList) {
+ List<TjCustomer> customerList = new ArrayList<>();
+ if(null !=orderList && orderList.size()>0){
+ for (TjOrder tjOrder : orderList) {
+ if (null != tjOrder) {
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ if (customer == null) {
+ continue;
+ }
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjOrder.getTjNumber());
+ customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+ customer.setOrderId(tjOrder.getOrderId());
+ customer.setTjTime(tjOrder.getCreateTime());
+ customer.setFinishTime(tjOrder.getFinishTime());
+ customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+ if (tjOrder.getFirmId() == null) {
+ customer.setTjCompName("鏃�");
+ } else {
+ DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
+ if (byId != null) {
+ customer.setTjCompName(byId.getCnName());
+ }
+ }
+ customerList.add(customer);
+ }
+ }
+ }
+ redisCache.setCacheMapValue("cScheck", "ys",customerList);
+ }
+
+
+ @Override
+ @Async("async")
+ public void tjRefund(List<TjProject> refundPros, String tjNum) {
+ for (TjProject refundPro : refundPros) {
+ LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjProject::getProParentId, refundPro.getProId());
+ List<Long> collect = projectService.list(wq0).stream().map(TjProject::getProId).collect(Collectors.toList());
+ LambdaQueryWrapper<TjSampling>wq1=new LambdaQueryWrapper<>();
+ wq1.eq(TjSampling::getTjNum,tjNum);
+ wq1.in(TjSampling::getProId,collect);
+ List<TjSampling> list = samplingService.list(wq1);
+ if(null !=list && list.size()>0) samplingService.removeByIds(list.stream().map(TjSampling::getId).collect(Collectors.toList()));
+ LambdaQueryWrapper<TjSampling>wq2=new LambdaQueryWrapper<>();
+ wq2.eq(TjSampling::getTjNum,tjNum);
+ wq2.eq(TjSampling::getProId,refundPro.getProId());
+ samplingService.remove(wq2);
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void saveSampling() {
+ redisCache.setCacheMapValue("sampling", "yqs",getYWqsResult(0));
+ redisCache.setCacheMapValue("sampling", "wqs",getYWqsResult(1));
+ }
+
+ @Override
+ @Async("async")
+ public void tjGoutAsync(List<QjDomainVo> domainVos, SysUser sysUser, Set<String> list) {
+ for (QjDomainVo domainVo : domainVos) {
+ TjOrderRemark remark = orderRemarkService.getById(domainVo.getRemarkId());
+ TjOrder order = orderService.getOrderByTjNum(domainVo.getTjNumber());
+ //缁欏純妫�琛ㄦ坊鍔犺褰�
+ if(domainVo.getType().equals(2)){
+ TjDiscardInspection td = new TjDiscardInspection();
+ td.setProId(String.valueOf(remark.getProId()));
+ td.setProName(projectService.selectTjProjectByProId(remark.getProId()).getProName());
+ td.setCusId(String.valueOf(order.getUserId()));
+ td.setCusName((tjCustomerService.getById(order.getUserId())).getCusName());
+ td.setRegistrationTime(order.getCreateTime());
+ td.setTjNum(domainVo.getTjNumber());
+ td.setCreateBy(sysUser.getNickName());
+ td.setCreateTime(new DateTime());
+ td.setUpdateBy(sysUser.getNickName());
+ td.setUpdateTime(new DateTime());
+ td.setCreateId(String.valueOf(sysUser.getUserId()));
+ td.setUpdateId(String.valueOf(sysUser.getUserId()));
+ discardInspectionService.save(td);
+ }
+
+ LambdaQueryWrapper<TjProject>wq1=new LambdaQueryWrapper<>();
+ wq1.eq(TjProject::getProParentId,remark.getProId());
+ List<TjProject> projectList = projectService.list(wq1);
+ if(null !=projectList && projectList.size()>0){
+ List<Long> collect = projectList.stream().map(TjProject::getProId).collect(Collectors.toList());
+ LambdaQueryWrapper<TjOrderDetail>wq2=new LambdaQueryWrapper<>();
+ wq2.eq(TjOrderDetail::getOrderId,order.getOrderId());
+ wq2.in(TjOrderDetail::getProId,collect);
+ List<TjOrderDetail> detailList = tjOrderDetailService.list(wq2);
+ if(null !=detailList && detailList.size()>0){
+ for (TjOrderDetail detail : detailList) {
+ detail.setTjStatus(Long.valueOf(remark.getType()));
+ if(null !=remark.getRemark()) detail.setRemark(domainVo.getRemark());
+ if(null !=remark.getYqDeadline()) detail.setYqDeadline(remark.getYqDeadline());
+ tjOrderDetailService.updateById(detail);
+ }
+ }
+ }
+ }
+ if (list.size() > 0) {
+ for (String s : list) {
+ TjOrder tjOrder = orderService.getOrderByTjNum(s);
+ if (null != tjOrder) {
+ tjOrder.setStatus(TjConstants.TJ_DELAY);
+ tjOrder.setFinishTime(null);
+ tjOrder.setUpdateBy(sysUser.getNickName());
+ tjOrder.setUpdateTime(new DateTime());
+ tjOrder.setUpdateId(String.valueOf(sysUser.getUserId()));
+ orderService.updateById(tjOrder);
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ TjYqOrder yqOrder=new TjYqOrder();
+ yqOrder.setTjNum(s);
+ yqOrder.setCusName(customer.getCusName());
+ yqOrder.setSex(String.valueOf(customer.getCusSex()));
+ yqOrder.setAge(customer.getAge());
+ yqOrder.setPhone(customer.getCusPhone());
+ yqOrder.setYqTime(new Date());
+ yqOrder.setOrderTime(tjOrder.getCreateTime());
+ yqOrder.setProIds(orderRemarkService.getTjOrderRemarkProIdList(s));
+ yqOrder.setEmilSend("0");
+ yqOrder.setMsgSend("0");
+ yqOrder.setCreateBy(sysUser.getNickName());
+ yqOrder.setCreateTime(new DateTime());
+ yqOrder.setUpdateBy(sysUser.getNickName());
+ yqOrder.setUpdateTime(new DateTime());
+ yqOrder.setCreateId(String.valueOf(sysUser.getUserId()));
+ yqOrder.setUpdateId(String.valueOf(sysUser.getUserId()));
+ yqOrderService.save(yqOrder);
+ }
+ }
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void addRedisTransitionPac(String cusId, Long pacId, List<TjPackageProject> ppList) {
+ for (TjPackageProject tjPackageProject : ppList) {
+ TjProject project = projectService.getById(tjPackageProject.getProId());
+ if (null != project) {
+ BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(),5, RoundingMode.DOWN);
+ LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
+ wq2.eq(TjProject::getProParentId, project.getProId());
+ List<TjProject> tjProSonList = projectService.list(wq2);
+ if (null != tjProSonList && tjProSonList.size() > 0) {
+ 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.setCreateTime(new Date());
+ tbTransition.setProType(tjProject.getProType());
+ tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
+ transitionService.save(tbTransition);
+ }
+
+ }
+ }
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void saveRedisTransitionByPacId(String cusId, Long pacId,List<Long> proIds) {
+ if(null != pacId){
+ transitionService.saveRedisTransitionByPacId(cusId,pacId);
+ }
+ if(null != proIds && proIds.size() > 0){
+ saveRedisTransitionByProId(cusId,proIds);
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void addRedisTransitionPro(String cusId, List<Long> proIds) {
+ for (Long proId : proIds) {
+ if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) && transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
+ continue;
+ }
+ TjProject project = projectService.getById(proId);
+ if (null != project) {
+ LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjProject::getProParentId, project.getProId());
+ List<TjProject> tjProSonList = projectService.list(wq1);
+ 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.setParentProId(proId);
+ tbTransition.setParentProName(project.getProName());
+ tbTransition.setProId(tjProject.getProId());
+ tbTransition.setProName(tjProject.getProName());
+ tbTransition.setCreateTime(new Date());
+ tbTransition.setProType(tjProject.getProType());
+ tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
+ transitionService.save(tbTransition);
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void getTjPackageList() {
+
+ //鐢蜂汉
+ getTjPackageListsByMan(tjPackageService.getTjPackageListByMan());
+
+ //濂充汉
+ getTjPackageListByWoMan(tjPackageService.getTjPackageListByWoMan());
+
+ //鏈煡
+ getTjPackageListByManAndWoMan(tjPackageService.list(new LambdaQueryWrapper<TjPackage>().eq(TjPackage::getPacStatus,0)));
+ }
+
+ @Override
+ @Async("async")
+ public void addNewReservationConfirm(List<TjReservation> rightList ) {
+ if(null !=rightList && rightList.size()>0){
+ for (TjReservation reservation : rightList) {
+ transitionService.deletedTbTransitionByCusId(reservation.getIdCard());
+ List<AddNewReservationConfirm> confirmList = groupingProService.getAddNewReservationConfirm(reservation.getGroupingId());
+ if (null !=confirmList && confirmList.size()>0){
+ for (AddNewReservationConfirm confirm : confirmList) {
+ List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(reservation.getIdCard(),confirm.getPid());
+ if (null != transitionss && transitionss.size() > 0) {
+ continue;
+ }
+ TbTransition tbTransition = new TbTransition();
+ tbTransition.setCusId(reservation.getIdCard());
+ tbTransition.setPacId(null);
+ if (null != confirm.getProPrice()) {
+ tbTransition.setOrdPrice(confirm.getProPrice());
+ tbTransition.setNowPrice(confirm.getProPrice().multiply(BigDecimal.valueOf(Long.parseLong(confirm.getLimits())).divide(BigDecimal.valueOf(10))));
+ } else {
+ tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
+ tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
+ }
+ tbTransition.setParentProId(Long.valueOf(confirm.getProId()));
+ tbTransition.setParentProName(confirm.getProName());
+ tbTransition.setProId(Long.valueOf(confirm.getPid()));
+ tbTransition.setProName(confirm.getPname());
+ tbTransition.setCreateTime(new Date());
+ transitionService.save(tbTransition);
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ @Async("async")
+ public void saveNewReservationConfirm(List<TjReservation> rightList) {
+ long l = System.currentTimeMillis();
+ if(null !=rightList && rightList.size()>0){
+ //鍒涘缓绾跨▼姹�
+ ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size());
+ for (TjReservation reservation : rightList) {
+ //鍒犻櫎涔嬪墠鐨勬暟鎹�
+ transitionService.deletedTbTransitionByCusId(reservation.getIdCard());
+ //鑾峰彇绾跨▼
+ threadPool.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ transitionService.saveTemoTransitionByGroupingId(reservation.getIdCard(),reservation.getGroupingId());
+
+ threadPool.shutdown();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+ }
+ long ll = System.currentTimeMillis();
+
+ System.out.println("杩欐浠ｇ爜鎵ц鏃堕棿涓�"+ (ll-l));
+ }
+
+ @Override
+ @Async("async")
+ public void updateCheckType(String tjNum) {
+// AjaxResult ajaxResult = getAjaxResult(tjNum);
+ redisCache.setCacheMapValue("updateCheckType"+tjNum,tjNum,getAjaxResult(tjNum));
+ }
+
+ @Override
+ @Async("async")
+ public void addRedis(List<TjCustomer> customers) {
+ for (TjCustomer customer : customers) {
+ redisCache.setCacheMapValue("updateCheckType"+customer.getTjNumber(),customer.getTjNumber(),getAjaxResult(customer.getTjNumber()));
+ }
+ }
+
+ private void getTjPackageListsByMan(List<TjPackage> tjPackageList) {
+ if (null != tjPackageList && tjPackageList.size() > 0) {
+ for (TjPackage aPackage : tjPackageList) {
+ List<TjProject> tjProjectList = new ArrayList<>();
+ List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
+ StringBuilder allProName = new StringBuilder();
+ String allSonName = null;
+ if (null != pplist) {
+ for (TjPackageProject packageProject : pplist) {
+// StringBuilder allSonProName = new StringBuilder();
+ TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
+ if (null != tjProject) {
+ allProName.append(tjProject.getProName()).append("锛�");
+// List<TjProject> projects = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
+ String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
+// for (TjProject project : projects) {
+// allSonProName.append(project.getProName()).append("锛�");
+// allSonName.append(project.getProName()).append("锛�");
+// tjProject.setAllSonProName(allSonProName.toString());
+// }
+ allSonName = name;
+ tjProject.setAllSonProName(name);
+ tjProjectList.add(tjProject);
+// List<TjProConsumables> list = tjProConsumablesService.list(packageProject.getProId());
+// List<TjConsumables> list1 = new ArrayList<>();
+// for (TjProConsumables tjProConsumables : list) {
+// list1.add(tjConsumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()));
+// }
+ List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
+ tjProject.setConsumablesList(list1);
+ }
+ }
+ }
+ aPackage.setTjProjectList(tjProjectList);
+ aPackage.setAllProName(allProName.toString());
+ aPackage.setAllSonName(allSonName);
+ }
+ if(redisCache.hasKey("getTjPackageListBySex")){
+ redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByMan");
+ }
+ redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByMan",tjPackageList);
+ }
+ }
+ private void getTjPackageListByWoMan(List<TjPackage> tjPackageList) {
+ if (null != tjPackageList && tjPackageList.size() > 0) {
+ for (TjPackage aPackage : tjPackageList) {
+ List<TjProject> tjProjectList = new ArrayList<>();
+ List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
+ StringBuilder allProName = new StringBuilder();
+ String allSonName = null;
+ if (null != pplist) {
+ for (TjPackageProject packageProject : pplist) {
+// StringBuilder allSonProName = new StringBuilder();
+ TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
+ if (null != tjProject) {
+ allProName.append(tjProject.getProName()).append("锛�");
+// List<TjProject> projects = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
+ String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
+// for (TjProject project : projects) {
+// allSonProName.append(project.getProName()).append("锛�");
+// allSonName.append(project.getProName()).append("锛�");
+// tjProject.setAllSonProName(allSonProName.toString());
+// }
+ allSonName = name;
+ tjProject.setAllSonProName(name);
+ tjProjectList.add(tjProject);
+// List<TjProConsumables> list = tjProConsumablesService.list(packageProject.getProId());
+// List<TjConsumables> list1 = new ArrayList<>();
+// for (TjProConsumables tjProConsumables : list) {
+// list1.add(tjConsumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()));
+// }
+ List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
+ tjProject.setConsumablesList(list1);
+ }
+ }
+ }
+ aPackage.setTjProjectList(tjProjectList);
+ aPackage.setAllProName(allProName.toString());
+ aPackage.setAllSonName(allSonName);
+ }
+ if(redisCache.hasKey("getTjPackageListBySex")){
+ redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByWoMan");
+ }
+ redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByWoMan",tjPackageList);
+ }
+ }
+ private void getTjPackageListByManAndWoMan(List<TjPackage> tjPackageList) {
+ if (null != tjPackageList && tjPackageList.size() > 0) {
+ for (TjPackage aPackage : tjPackageList) {
+ List<TjProject> tjProjectList = new ArrayList<>();
+ List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
+ StringBuilder allProName = new StringBuilder();
+ String allSonName = null;
+ if (null != pplist) {
+ for (TjPackageProject packageProject : pplist) {
+ TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
+ if (null != tjProject) {
+ allProName.append(tjProject.getProName()).append("锛�");
+ String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
+ allSonName = name;
+ tjProject.setAllSonProName(name);
+ tjProjectList.add(tjProject);
+ List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
+ tjProject.setConsumablesList(list1);
+ }
+ }
+ }
+ aPackage.setTjProjectList(tjProjectList);
+ aPackage.setAllProName(allProName.toString());
+ aPackage.setAllSonName(allSonName);
+ }
+ if(redisCache.hasKey("getTjPackageListBySex")){
+ redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByManAndWoMan");
+ }
+ redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByManAndWoMan",tjPackageList);
+ }
+ }
+
+
+ //宸叉
+ public List<TjCustomer> getYjAjaxResult(List<Long> ksproList) {
+ List<TjCustomer> customerLis = new ArrayList<>();
+ LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrderDetail::getTjStatus, 1);
+ wq1.in(TjOrderDetail::getProId, ksproList);
+ wq1.isNotNull(TjOrderDetail::getFlowingWaterId);
+ wq1.orderByDesc(TjOrderDetail::getCreateTime);
+ List<TjOrderDetail> detailList = tjOrderDetailService.list(wq1);
+ if (null != detailList && detailList.size() > 0) {
+ //鏀堕泦orderId骞跺幓閲�
+ List<Long> orderIds = detailList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
+ () -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
+ ), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
+ for (Long orderId : orderIds) {
+ if (null != orderId) {
+ TjOrder order = orderService.getById(orderId);
+ if(null ==order){
+ continue;
+ }
+ LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
+ qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
+ qww.eq(TjOrderDetail::getTjStatus, 0);
+ qww.isNotNull(TjOrderDetail::getFlowingWaterId);
+ List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
+ if (null != lists && lists.size() > 0) {
+ continue;
+ }
+
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ if (null != customer) {
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+ if (order.getTjType().equals("1")) {
+ customer.setTjType("鍥綋");
+ }
+ if (order.getTjType().equals("2")) {
+ customer.setTjType("涓汉");
+ }
+ customer.setTjTime(order.getCreateTime());
+ customer.setTjNumber(order.getTjNumber());
+ customer.setTjStatus(1L);
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+ wq.in(TjOrderRemark::getType, 0,3);
+ List<TjOrderRemark> list = orderRemarkService.list(wq);
+ if (null != list && list.size() > 0) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (TjOrderRemark remark : list) {
+ TjProject byId = projectService.getById(remark.getProId());
+ stringBuilder.append(byId.getProName()).append(";");
+ }
+ customer.setNotCheckeds(String.valueOf(stringBuilder));
+ if(null ==customer.getNotCheckeds())customer.setNotCheckeds("鍏ㄩ儴宸叉");
+ }
+ customerLis.add(customer);
+ }
+ }
+ }
+ }
+ return customerLis;
+ }
+
+ //鏈
+ public List<TjCustomer> getWjAjaxResult(List<Long> ksproList) {
+ List<TjCustomer> customerLis = new ArrayList<>();
+ LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrderDetail::getTjStatus, 0);
+ wq1.in(TjOrderDetail::getProId, ksproList);
+ wq1.isNotNull(TjOrderDetail::getFlowingWaterId);
+ wq1.orderByDesc(TjOrderDetail::getCreateTime);
+ List<TjOrderDetail> detailList = tjOrderDetailService.list(wq1);
+ if (null != detailList && detailList.size() > 0) {
+ //鏀堕泦orderId骞跺幓閲�
+ List<Long> orderIds = detailList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
+ () -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
+ ), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
+ for (Long orderId : orderIds) {
+ if (null != orderId) {
+ TjOrder order = orderService.getById(orderId);
+ if(null ==order){
+ continue;
+ }
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ if (null != customer) {
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+
+ if (order.getTjType().equals("1")) {
+ customer.setTjType("鍥綋");
+ }
+ if (order.getTjType().equals("2")) {
+ customer.setTjType("涓汉");
+ }
+ customer.setTjTime(order.getCreateTime());
+ customer.setTjNumber(order.getTjNumber());
+ customer.setTjStatus(0L);
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+ wq.in(TjOrderRemark::getType, 0,3);
+ List<TjOrderRemark> list = orderRemarkService.list(wq);
+ if (null != list && list.size() > 0) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (TjOrderRemark remark : list) {
+ TjProject byId = projectService.getById(remark.getProId());
+ stringBuilder.append(byId.getProName()).append(";");
+ }
+ customer.setNotCheckeds(String.valueOf(stringBuilder));
+ if(null ==customer.getNotCheckeds())customer.setNotCheckeds("鍏ㄩ儴宸叉");
+ }
+ customerLis.add(customer);
+ }
+ }
+ }
+ }
+ return customerLis;
+ }
+
+ //宸插
+ private List<TjCustomer> getYsResult(String config) {
+ List<TjOrder> orderList = null;
+ if("Y".equals(config)){
+ orderList = orderService.getCsTjOrderList1(null,1,null,null,null);
+ }else {
+ orderList = orderService.getTjOrderList(null,1,null,null,null);
+ }
+ List<TjCustomer> customerList = new ArrayList<>();
+ if(null !=orderList && orderList.size()>0){
+ for (TjOrder tjOrder : orderList) {
+ if (null != tjOrder) {
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ if (customer == null) {
+ continue;
+ }
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjOrder.getTjNumber());
+ customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+ customer.setOrderId(tjOrder.getOrderId());
+ customer.setTjTime(tjOrder.getCreateTime());
+ customer.setFinishTime(tjOrder.getFinishTime());
+ customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+ if (tjOrder.getFirmId() == null) {
+ customer.setTjCompName("鏃�");
+ } else {
+ DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
+ if (byId != null) {
+ customer.setTjCompName(byId.getCnName());
+ }
+ }
+ customerList.add(customer);
+ }
+ }
+ }
+ return customerList;
+ }
+
+ //鏈
+ private List<TjCustomer> getWsResult(String config) {
+ List<TjOrder> orderList = null;
+ if("Y".equals(config)){
+ orderList = orderService.getCsTjOrderList1(null,0,null,null,null);
+ }else {
+ orderList = orderService.getTjOrderList(null,0,null,null,null);
+ }
+ List<TjCustomer> customerList = new ArrayList<>();
+ if(null !=orderList && orderList.size()>0) {
+ for (TjOrder tjOrder : orderList) {
+ if (null != tjOrder) {
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ if (customer == null) {
+ continue;
+ }
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjOrder.getTjNumber());
+ customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+ customer.setOrderId(tjOrder.getOrderId());
+ customer.setTjTime(tjOrder.getCreateTime());
+ customer.setFinishTime(tjOrder.getFinishTime());
+ customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+ if (tjOrder.getFirmId() == null) {
+ customer.setTjCompName("鏃�");
+ } else {
+ DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
+ if (byId != null) {
+ customer.setTjCompName(byId.getCnName());
+ }
+ }
+ customerList.add(customer);
+ }
+ }
+ }
+ return customerList;
+ }
+
+ //鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏
+ private AjaxResult getAjaxResult(String tjNumber) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+
+ TjCustomer customer = tjCustomerService.getById(one.getUserId());
+ List<TjOrderRemark> remarkList = orderRemarkService.getRemarkListByTjNumAndType(tjNumber);
+
+ if (null != remarkList && remarkList.size() > 0) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> parent = new HashMap<>();
+ parent.put("checkAdvice", one.getCheckAdvice());
+ TjProject project = projectService.selectTjProjectByProId(remark.getProId());
+ if (null != project) {
+ parent.put("parent", project.getProName());
+ parent.put("parentId", project.getProId().toString());
+ }
+ List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), remark.getProId());
+ if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+ tjOrderDetail.setProject(byId);
+ List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
+ if (list2.size() == 0) {
+ tjOrderDetail.setStandard(new TjStandard());
+ } else if (list2.size() == 1) {
+ tjOrderDetail.setStandard(list2.get(0));
+ } else {
+ final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
+ TjStandard tjStandard1=tjStandardService.getListBySexAndType(customer.getCusSex(),ageType, String.valueOf(tjOrderDetail.getProId()));
+ tjOrderDetail.setStandard(tjStandard1);
+ }
+ }
+ String summary = remark.getSummary();
+ if (null != summary) {
+ String[] split = summary.split(";");
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split)));
+
+ } else {
+ parent.put("parentAdvice", null);
+ }
+ parent.put("sons", tjOrderDetails);
+ parent.put("remark", remark.getRemark());
+ if (remark.getDoctorName() != null && null != userService.getById(remark.getDoctorName())) {
+ parent.put("doctorName", userService.getById(remark.getDoctorName()).getNickName());
+ }
+ list.add(parent);
+ } else {
+ return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
+ }
+// }
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ }
+
+ //宸茬鏀�/鏈鏀�
+ private List<Map<String, Object>> getYWqsResult(int a) {
+ LambdaQueryWrapper<TjSampling>wq=new LambdaQueryWrapper<>();
+ List<Map<String,Object>> arrayList=new ArrayList<>();
+ wq.orderByDesc(TjSampling::getApplicationTime);
+ wq.eq(TjSampling::getIsSignFor,a);
+ List<TjSampling> list = tjSamplingService.list(wq);
+ if(null != list && list.size()>0 ){
+ Map<String, List<TjSampling>> stringListMap = list.stream().collect(Collectors.groupingBy(TjSampling::getCusId));
+ for (Map.Entry<String, List<TjSampling>> entry : stringListMap.entrySet()) {
+ Map<String,Object>map=new HashMap<>();
+ TjCustomer customer = tjCustomerService.getById(entry.getKey());
+ if (customer==null){
+ continue;
+ }
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(entry.getValue().get(0).getTjNum());
+ customer.setApplicationTime(entry.getValue().get(0).getApplicationTime());
+ List<TjSampling> samplings = entry.getValue();
+ if(null !=samplings && samplings.size()>0){
+ List<TjSampling> projectList=new ArrayList<>();
+ for (TjSampling sampling : samplings) {
+ TjProject project = projectService.getById(sampling.getProId());
+ if(null !=project && project.getProParentId()==0){
+ projectList.add(sampling);
+ }
+ }
+ map.put("list",projectList);
+ }
+ map.put("customer",customer);
+ arrayList.add(map);
+ }
+ }
+ return arrayList;
+ }
+
+
+ /**
+ * 闅愯棌鎵嬫満鍙�
+ *
+ * @param phoneNum
+ * @return
+ */
+ public static String hidePhoneNum(String phoneNum){
+ if(phoneNum.contains("*")){
+ return phoneNum;
+ }
+ Pattern pattern = Pattern.compile("((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}");
+ Matcher matcher = pattern.matcher(phoneNum);
+ StringBuffer sb = new StringBuffer();
+ try {
+ while(matcher.find()) {
+ String phoneStr = matcher.group();
+ phoneStr = phoneStr.substring(0, 3) + "****" + phoneStr.substring(7, phoneStr.length());
+ matcher.appendReplacement(sb,phoneStr);
+ }
+ matcher.appendTail(sb);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 闅愯棌韬唤璇佸彿鐮�
+ *
+ * @param idCardNum
+ * @return
+ */
+ public static String hideIdCardNum(String idCardNum){
+ if(idCardNum.contains("*")){
+ return idCardNum;
+ }
+ Pattern pattern = Pattern.compile("(\\d{6})(19|20)(\\d{2})(1[0-2]|0[1-9])(0[1-9]|[1-2][0-9]|3[0-1])(\\d{3})(\\d|X|x)");
+ Matcher matcher = pattern.matcher(idCardNum);
+ StringBuffer sb = new StringBuffer();
+ try {
+ while(matcher.find()) {
+ String idCardStr = matcher.group();
+ int len=idCardStr.length();
+ if(len>=9){
+ idCardStr = idCardStr.replaceAll("(.{"+(len<12?3:6)+"})(.*)(.{4})", "$1" + "****" + "$3");
+ }
+ matcher.appendReplacement(sb,idCardStr);
+ }
+ matcher.appendTail(sb);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return sb.toString();
+ }
+
+
+ /**
+ * 闅愯棌鐢ㄦ埛濮撳悕
+ *
+ * @param cusName
+ * @return
+ */
+ public static String hideCusName(String cusName){
+ if(!cusName.contains("*")){
+ String realname=null;
+ char[] r = cusName.toCharArray();
+ if(r.length ==1){
+ realname = cusName;
+ }
+ if(r.length == 2){
+ realname = cusName.replaceFirst(cusName.substring(1),"*");
+ }
+ if (r.length > 2) {
+ realname = cusName.replaceFirst(cusName.substring(1,r.length-1) ,"*");
+ }
+ return realname;
+ }
+ return cusName;
+ }
+
+
+ //涓存椂琛ㄦ坊鍔犲崟椤�
+ public void saveRedisTransitionByProId(String cusId, List<Long> proIds) {
+ for (Long proId : proIds) {
+ if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) && transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
+ continue;
+ }
+ transitionService.saveRedisTransitionByProId(cusId,proId);
+ }
+ }
+}
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 402c338..bd20863 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
@@ -610,6 +610,7 @@
}
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
+ asyncService.updateCheckType(orderRemark.getTjNumber());
}
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 051fd14..dc2ccb9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -225,7 +225,7 @@
// @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')")
@Transactional
public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
- @ApiParam(value = "鐘舵�� 0鍚屾剰1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
+ @ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
@ApiParam(value = "椹冲洖鐞嗙敱") @RequestParam(required = false) String remark) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘瀹℃牳!");
@@ -241,6 +241,7 @@
tjOrder.setConfirmStatus(remark);
if (status == 0) {
tjOrder.setStatus(TjConstants.TJ_CHECK);
+ asyncService.updateCheckType(tjNumber);
} else {
tjOrder.setStatus(TjConstants.TJ_REFUSED);
}
@@ -358,6 +359,7 @@
customers = redisCache.getCacheMapValue("check", "ys");
}
if (customers != null && customers.size() > 0) {
+ asyncService.addRedis(customers);
List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
map.put("customers", customerLists);
map.put("total", customers.size());
@@ -434,6 +436,13 @@
@ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏")
// @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ if(redisCache.hasKey("updateCheckType"+tjNumber)) {
+ return redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
+ }
+ return getAjaxResult(tjNumber);
+ }
+
+ private AjaxResult getAjaxResult(String tjNumber) {
final long l = System.currentTimeMillis();
List<Map<String, Object>> list = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNumber);
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index da82a9b..63d2d2d 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -1,10 +1,6 @@
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.ltkj.LtkjApplication;
-import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.hosp.service.*;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -13,18 +9,11 @@
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.test.context.junit4.SpringRunner;
-import org.yaml.snakeyaml.events.Event;
import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.List;
-import java.util.Locale;
/**
@@ -48,8 +37,36 @@
private ITjOrderDetailService tjOrderDetailService;
@Resource
private ITjOrderRemarkService remarkService;
+
+ @Resource
+ private RedisCache redisCache;
+
+ @Autowired
+ public RedisTemplate<String,String> redisTemplate;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+
@Test
public void test() {
+// util.setDataBase(1);
+// stringRedisTemplate.opsForValue().set("1","1");
+// ExecutorService pool = Executors.newFixedThreadPool(5);
+//
+// for (int i = 1; i < 6; i++) {
+// int finalI = i;
+// pool.execute(new Runnable() {
+// @Override
+// public void run() {
+// try {
+// redisCache.setDataBase(finalI);
+// redisCache.setCacheObject("娴嬭瘯",finalI+"111111111111111111");
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// pool.shutdown();
+// }
+// });
+// }
log.info("鍢垮樋!!!");
}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/redis/RedisCache.java b/ltkj-common/src/main/java/com/ltkj/common/core/redis/RedisCache.java
index fd83cf0..e124629 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/redis/RedisCache.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/redis/RedisCache.java
@@ -8,6 +8,7 @@
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.BoundSetOperations;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
@@ -25,6 +26,17 @@
@Autowired
public RedisTemplate redisTemplate;
+ public RedisTemplate setDataBase(int num) {
+ LettuceConnectionFactory connectionFactory = (LettuceConnectionFactory) redisTemplate.getConnectionFactory();
+ if (connectionFactory != null && num != connectionFactory.getDatabase()) {
+ connectionFactory.setDatabase(num);
+ this.redisTemplate.setConnectionFactory(connectionFactory);
+ connectionFactory.resetConnection();
+ connectionFactory.afterPropertiesSet();
+ }
+ return redisTemplate;
+ }
+
/**
* 缂撳瓨鍩烘湰鐨勫璞★紝Integer銆丼tring銆佸疄浣撶被绛�
*
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
index de358f5..1edbb5e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
@@ -71,4 +71,9 @@
//鍥綋棰勭害鏃跺悜涓存椂琛ㄦ坊鍔犳暟鎹�
void addNewReservationConfirm(List<TjReservation> rightList);
void saveNewReservationConfirm(List<TjReservation> rightList);
+
+ //鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏
+ void updateCheckType(String tjNum);
+
+ void addRedis(List<TjCustomer> customers);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java
index fb094cd..a6e746b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java
@@ -1,226 +1,126 @@
-package com.ltkj.hosp.service.impl;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ltkj.common.core.domain.AjaxResult;
-import com.ltkj.common.core.domain.entity.SysUser;
-import com.ltkj.common.core.redis.RedisCache;
-import com.ltkj.common.utils.SecurityUtils;
-import com.ltkj.common.utils.StringUtils;
-import com.ltkj.hosp.domain.*;
-import com.ltkj.hosp.service.*;
-import com.ltkj.hosp.vodomain.AddNewReservationConfirm;
-import com.ltkj.hosp.vodomain.QjDomainVo;
-import com.ltkj.mall.mallOrderUtils.TjConstants;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
- * @Author: zjh
- * @Date: 2023/3/29 17:28
- */
-@Service
-@Transactional
-public class TjAsyncServiceImpl implements TjAsyncService {
- @Resource
- private ITjProjectService projectService;
- @Resource
- private ITjCustomerService tjCustomerService;
- @Resource
- private ITbTransitionService transitionService;
- @Resource
- private ITjOrderDetailService tjOrderDetailService;
- @Resource
- private ITjOrderRemarkService orderRemarkService;
- @Resource
- private ITjChargingStandardService chargingStandardService;
- @Resource
- private TjProConsumablesService proConsumablesService;
- @Resource
- private ITjConsumablesService consumablesService;
- @Resource
- private ITjDiscardInspectionService discardInspectionService;
- @Resource
- private ITjPackageService tjPackageService;
- @Resource
- private RedisCache redisCache;
- @Resource
- private ITjOrderService orderService;
- @Resource
- private IDictCompService compService;
- @Resource
- private ITjSamplingService samplingService;
- @Resource
- private ITjSamplingService tjSamplingService;
- @Resource
- private ITjPackageProjectService ppservice;
- @Resource
- private TjYqOrderService yqOrderService;
- @Autowired
- private ITjAskMedicalHistoryService tjAskMedicalHistoryService;
- @Autowired
- private ITjGroupingProService groupingProService;
-
- @Override
- public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
- long l = System.currentTimeMillis();
-
- LambdaQueryWrapper<TjAskMedicalHistory> wq=new LambdaQueryWrapper<>();
- wq.eq(TjAskMedicalHistory::getCusId,tjCustomer.getCusId());
- wq.isNull(TjAskMedicalHistory::getTjNum);
- TjAskMedicalHistory history = tjAskMedicalHistoryService.getOne(wq);
- if(null !=history){
- history.setTjNum(tjOrder.getTjNumber());
- tjAskMedicalHistoryService.updateById(history);
- }
-
- List<TbTransition> tbTransitionList =null;
- if (redisCache.hasKey(tjCustomer.getCusIdcard())) {
- tbTransitionList = redisCache.getCacheList(tjCustomer.getCusIdcard());
- redisCache.deleteObject(tjCustomer.getCusIdcard());
- }else {
- LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TbTransition::getCusId, tjCustomer.getCusIdcard());
- tbTransitionList = transitionService.list(wqq);
- }
- if (redisCache.hasKey(tjCustomer.getCusIdcard() + "cusId"))
- redisCache.deleteObject(tjCustomer.getCusIdcard() + "cusId");
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
-
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),String.valueOf(tjOrder.getOrderId()),sysUser.getNickName(),String.valueOf(sysUser.getUserId()));
-
- //淇敼姣忛」鐨勫師浠风幇浠�
- for (TbTransition transition : tbTransitionList) {
- transition.setOrdPrice(transition.getNowPrice());
- transition.setNowPrice(transition.getNowPrice().multiply(discount));
- transitionService.updateById(transition);
- }
- }
- LambdaQueryWrapper<TjOrderDetail> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
- List<TjOrderDetail> list = tjOrderDetailService.list(wrapper1);
- if (list != null && list.size()>0) {
- for (TjOrderDetail tjOrderDetail : list) {
- TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
- if(tjProject==null){
- continue;
- }
- tjOrderDetail.setProject(tjProject);
- if (tjProject.getProParentId() == 0) {
- TjOrderRemark tjOrderRemark = new TjOrderRemark();
- tjOrderRemark.setProId(tjProject.getProId());
- tjOrderRemark.setProName(tjProject.getProName());
- tjOrderRemark.setDeptId(tjProject.getDeptId());
- tjOrderRemark.setTjNumber(tjOrder.getTjNumber());
- tjOrderRemark.setCreateBy(sysUser.getNickName());
- tjOrderRemark.setCreateTime(new Date());
- tjOrderRemark.setUpdateBy(sysUser.getNickName());
- tjOrderRemark.setUpdateTime(new Date());
- tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
- tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
- orderRemarkService.save(tjOrderRemark);
- }
- if ("1".equals(tjOrder.getTjType())) {
- if (null != tjReservation && tjReservation.getPayType() == 1) {
- tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- }
- }
- if(tjFlowingWater.getPayStasus()==1){
- tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- }
- tjOrderDetailService.updateById(tjOrderDetail);
- }
- }
- System.out.println("杩欐浠ｇ爜鏃堕棿"+(l-System.currentTimeMillis()));
- }
-
- @Override
- @Async("async")
- public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer,SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
-
- tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
-
- boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- if (!b){
- List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjOrder.getGroupId()));
- if(null !=proList && proList.size()>0){
- for (TjGroupingPro groupingPro : proList) {
- TjOrderDetail detail = new TjOrderDetail();
-// if (null != transition.getPacId()) {
-// detail.setProType(String.valueOf(transition.getPacId()));
-// }
- TjProject tjProject = projectService.selectTjProjectByProId(Long.valueOf(groupingPro.getProId()));
- detail.setIsSampling(String.valueOf(tjProject.getIsSampling()));
- detail.setOrderId(tjOrder.getOrderId());
- detail.setProId(Long.valueOf(groupingPro.getProId()));
- detail.setTjStatus(0L);
- detail.setCreateBy(sysUser.getNickName());
- detail.setCreateTime(new Date());
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(new Date());
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailService.save(detail);
- }
- List<String> list = proList.stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
- List<TjProject> projectList = projectService.list(new LambdaQueryWrapper<TjProject>().in(TjProject::getProParentId, list));
- for (TjProject project : projectList) {
- TjOrderDetail detail = new TjOrderDetail();
- detail.setOrderId(tjOrder.getOrderId());
- detail.setProId(project.getProId());
- detail.setTjStatus(0L);
- detail.setCreateBy(sysUser.getNickName());
- detail.setCreateTime(new Date());
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(new Date());
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
- //鑾峰彇璇ラ」鐩殑榛樿鍊艰祴鍊肩粰缁撴灉
- if(null !=project.getProDefault()){
- detail.setProResult(project.getProDefault());
- }else {
- detail.setProResult(null);
- }
- detail.setIsSampling(String.valueOf(project.getIsSampling()));
-
- tjOrderDetailService.save(detail);
- }
- }
- }
-
- //娣诲姞remark琛ㄦ暟鎹�
- orderRemarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
-
- //鍒ゆ柇鏄惁浜ら挶
- if ("1".equals(tjOrder.getTjType())) {
- if (null != tjReservation && tjReservation.getPayType() == 1) {
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
- }
- }
- if (tjFlowingWater.getPayStasus() == 1) {
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
- }
-
-// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
-// if (list != null) {
+//package com.ltkj.hosp.service.impl;
+//
+//import cn.hutool.core.date.DateTime;
+//import cn.hutool.core.date.DateUtil;
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.ltkj.common.core.domain.AjaxResult;
+//import com.ltkj.common.core.domain.entity.SysUser;
+//import com.ltkj.common.core.redis.RedisCache;
+//import com.ltkj.common.utils.SecurityUtils;
+//import com.ltkj.common.utils.StringUtils;
+//import com.ltkj.hosp.domain.*;
+//import com.ltkj.hosp.service.*;
+//import com.ltkj.hosp.vodomain.AddNewReservationConfirm;
+//import com.ltkj.hosp.vodomain.QjDomainVo;
+//import com.ltkj.mall.mallOrderUtils.TjConstants;
+//import org.bouncycastle.util.io.pem.PemObject;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import javax.annotation.Resource;
+//import java.math.BigDecimal;
+//import java.math.RoundingMode;
+//import java.nio.charset.StandardCharsets;
+//import java.util.*;
+//import java.util.concurrent.ExecutorService;
+//import java.util.concurrent.Executors;
+//import java.util.regex.Matcher;
+//import java.util.regex.Pattern;
+//import java.util.stream.Collectors;
+//
+///**
+// * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+// * @Author: zjh
+// * @Date: 2023/3/29 17:28
+// */
+//@Service
+//@Transactional
+//public class TjAsyncServiceImpl implements TjAsyncService {
+// @Resource
+// private ITjProjectService projectService;
+// @Resource
+// private ITjCustomerService tjCustomerService;
+// @Resource
+// private ITbTransitionService transitionService;
+// @Resource
+// private ITjOrderDetailService tjOrderDetailService;
+// @Resource
+// private ITjOrderRemarkService orderRemarkService;
+// @Resource
+// private ITjChargingStandardService chargingStandardService;
+// @Resource
+// private TjProConsumablesService proConsumablesService;
+// @Resource
+// private ITjConsumablesService consumablesService;
+// @Resource
+// private ITjDiscardInspectionService discardInspectionService;
+// @Resource
+// private ITjPackageService tjPackageService;
+// @Resource
+// private RedisCache redisCache;
+// @Resource
+// private ITjOrderService orderService;
+// @Resource
+// private IDictCompService compService;
+// @Resource
+// private ITjSamplingService samplingService;
+// @Resource
+// private ITjSamplingService tjSamplingService;
+// @Resource
+// private ITjPackageProjectService ppservice;
+// @Resource
+// private TjYqOrderService yqOrderService;
+// @Autowired
+// private ITjAskMedicalHistoryService tjAskMedicalHistoryService;
+// @Autowired
+// private ITjGroupingProService groupingProService;
+// @Resource
+// private ITjStandardService tjStandardService;
+// @Resource
+// private ITjAdviceService tjAdviceService;
+//
+//
+// @Override
+// public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
+// long l = System.currentTimeMillis();
+//
+// LambdaQueryWrapper<TjAskMedicalHistory> wq=new LambdaQueryWrapper<>();
+// wq.eq(TjAskMedicalHistory::getCusId,tjCustomer.getCusId());
+// wq.isNull(TjAskMedicalHistory::getTjNum);
+// TjAskMedicalHistory history = tjAskMedicalHistoryService.getOne(wq);
+// if(null !=history){
+// history.setTjNum(tjOrder.getTjNumber());
+// tjAskMedicalHistoryService.updateById(history);
+// }
+//
+// List<TbTransition> tbTransitionList =null;
+// if (redisCache.hasKey(tjCustomer.getCusIdcard())) {
+// tbTransitionList = redisCache.getCacheList(tjCustomer.getCusIdcard());
+// redisCache.deleteObject(tjCustomer.getCusIdcard());
+// }else {
+// LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TbTransition::getCusId, tjCustomer.getCusIdcard());
+// tbTransitionList = transitionService.list(wqq);
+// }
+// if (redisCache.hasKey(tjCustomer.getCusIdcard() + "cusId"))
+// redisCache.deleteObject(tjCustomer.getCusIdcard() + "cusId");
+// if (null != tbTransitionList && tbTransitionList.size() > 0) {
+//
+// tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),String.valueOf(tjOrder.getOrderId()),sysUser.getNickName(),String.valueOf(sysUser.getUserId()));
+//
+// //淇敼姣忛」鐨勫師浠风幇浠�
+// for (TbTransition transition : tbTransitionList) {
+// transition.setOrdPrice(transition.getNowPrice());
+// transition.setNowPrice(transition.getNowPrice().multiply(discount));
+// transitionService.updateById(transition);
+// }
+// }
+// LambdaQueryWrapper<TjOrderDetail> wrapper1 = new LambdaQueryWrapper<>();
+// wrapper1.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+// List<TjOrderDetail> list = tjOrderDetailService.list(wrapper1);
+// if (list != null && list.size()>0) {
// for (TjOrderDetail tjOrderDetail : list) {
// TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
// if(tjProject==null){
@@ -252,1089 +152,1255 @@
// tjOrderDetailService.updateById(tjOrderDetail);
// }
// }
- }
-
- @Override
- @Async("async")
- public void collectFees(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList, SysUser sysUser, String discount) {
- orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
- for (TbTransition transition : tbTransitionList) {
- transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).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(new Date());
- tjChargingStandard.setUpdateBy(sysUser.getNickName());
- tjChargingStandard.setUpdateTime(new Date());
- tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
- tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
- chargingStandardService.save(tjChargingStandard);
- }
- }
-
- //鐖堕」
- ArrayList<TbTransition> collect1 = tbTransitionList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbTransition::getParentProId))), ArrayList::new));
- List<Long> parentProIds = collect1.stream().map(TbTransition::getParentProId).collect(Collectors.toList());
- if (parentProIds.size() > 0) {
- for (Long parentProId : parentProIds) {
- TjProject parentProject = projectService.selectTjProjectByProId(parentProId);
- if (null != parentProject) {
- 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);
- }
- }
- TjOrderRemark tjOrderRemark=new TjOrderRemark();
- tjOrderRemark.setProId(parentProId);
- tjOrderRemark.setProName(parentProject.getProName());
- tjOrderRemark.setDeptId(parentProject.getDeptId());
- tjOrderRemark.setTjNumber(order.getTjNumber());
- tjOrderRemark.setCreateBy(sysUser.getNickName());
- tjOrderRemark.setCreateTime(new Date());
- tjOrderRemark.setUpdateBy(sysUser.getNickName());
- tjOrderRemark.setUpdateTime(new Date());
- tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
- tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
- orderRemarkService.save(tjOrderRemark);
- }
- }
- }
-
- ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
- for (TjConsumables tjConsumables : collect) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setConsumablesId(tjConsumables.getId());
- tjChargingStandard.setPrice(tjConsumables.getPrice());
- tjChargingStandard.setProName(tjConsumables.getMakings());
- tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
- tjChargingStandard.setCompany(tjConsumables.getSpecifications());
- tjChargingStandard.setCreateBy(sysUser.getNickName());
- tjChargingStandard.setCreateTime(new Date());
- tjChargingStandard.setUpdateBy(sysUser.getNickName());
- tjChargingStandard.setUpdateTime(new Date());
- tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
- tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
- chargingStandardService.save(tjChargingStandard);
- }
-
- LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderDetail::getOrderId,order.getOrderId());
- 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);
- }
- }
- }
-
- @Override
- @Async("async")
- public void abandonCheck(String tjNumber, TjOrder tjOrder, List<TjOrderDetail> list, SysUser sysUser) {
- for (TjOrderDetail tjOrderDetail : list) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProId, tjOrderDetail.getProId());
- TjProject one = projectService.getOne(wq1);
- if (one != null) {
- if (one.getProParentId() != 0) {
- tjOrderDetail.setTjStatus(2L);
- tjOrderDetail.setProResult("寮冩");
- tjOrderDetail.setUpdateTime(new DateTime());
- tjOrderDetailService.updateById(tjOrderDetail);
- } else {
- tjOrderDetail.setTjStatus(1L);
- tjOrderDetail.setUpdateTime(new DateTime());
- tjOrderDetailService.updateById(tjOrderDetail);
- }
- //缁欏純妫�琛ㄦ坊鍔犺褰�
- TjDiscardInspection td = new TjDiscardInspection();
- td.setProId(String.valueOf(one.getProId()));
- td.setProName(one.getProName());
- td.setCusId(String.valueOf(tjOrder.getUserId()));
- td.setCusName((tjCustomerService.getById(tjOrder.getUserId())).getCusName());
- td.setRegistrationTime(tjOrder.getCreateTime());
- td.setTjNum(tjNumber);
- td.setCreateBy(sysUser.getNickName());
- td.setCreateTime(new DateTime());
- td.setUpdateBy(sysUser.getNickName());
- td.setUpdateTime(new DateTime());
- td.setCreateId(String.valueOf(sysUser.getUserId()));
- td.setUpdateId(String.valueOf(sysUser.getUserId()));
- discardInspectionService.save(td);
- }
- }
- }
-
- @Override
- @Async("async")
- public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order) {
- for (TjOrderDetail detail : tjOrderDetailList) {
- detail.setTjStatus(1L);
- LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjStandard::getProId, detail.getProId());
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(new Date());
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailService.updateById(detail);
- }
- }
-
- @Override
- @Async("async")
- public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
- List<TjConsumables> list2 = new ArrayList<>();
- String[] tjProIds = tjFlowingWater.getTjProIds();
- for (String tjProId : tjProIds) {
- TjProject project = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
- TjOrderRemark tjOrderRemark=new TjOrderRemark();
- tjOrderRemark.setProId(Long.valueOf(tjProId));
- tjOrderRemark.setProName(project.getProName());
- tjOrderRemark.setDeptId(project.getDeptId());
- tjOrderRemark.setTjNumber(order.getTjNumber());
- tjOrderRemark.setCreateBy(sysUser.getNickName());
- tjOrderRemark.setCreateTime(new Date());
- tjOrderRemark.setUpdateBy(sysUser.getNickName());
- tjOrderRemark.setUpdateTime(new Date());
- tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
- tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
- orderRemarkService.save(tjOrderRemark);
- 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());
- detail.setCreateTime(new Date());
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(new Date());
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailService.save(detail);
- for (Long proId : proIds) {
- TjOrderDetail detail1 = new TjOrderDetail();
- detail1.setTjStatus(0L);
- detail1.setOrderId(tjFlowingWater.getOrderId());
- detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- detail1.setProId(proId);
- detail1.setIsAddition("Y");
- detail.setCreateBy(sysUser.getNickName());
- detail.setCreateTime(new Date());
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(new Date());
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailService.save(detail1);
- }
- LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
- wqq.in(TbTransition::getProId, proIds);
- List<TbTransition> tbTransitionList = transitionService.list(wqq);
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
- for (TbTransition transition : tbTransitionList) {
- 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(new Date());
- tjChargingStandard.setUpdateBy(sysUser.getNickName());
- tjChargingStandard.setUpdateTime(new Date());
- tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
- tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
- chargingStandardService.save(tjChargingStandard);
- }
- }
- //鐖堕」
- TjProject parentProject = projectService.getById(tjProId);
- if (null != parentProject) {
- 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);
- }
- }
- }
- }
- }
- //鐖堕」鑰楁潗
- ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
- for (TjConsumables tjConsumables : collect) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setConsumablesId(tjConsumables.getId());
- tjChargingStandard.setPrice(tjConsumables.getPrice());
- tjChargingStandard.setProName(tjConsumables.getMakings());
- tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
- tjChargingStandard.setCompany(tjConsumables.getSpecifications());
- tjChargingStandard.setCreateBy(sysUser.getNickName());
- tjChargingStandard.setCreateTime(new Date());
- tjChargingStandard.setUpdateBy(sysUser.getNickName());
- tjChargingStandard.setUpdateTime(new Date());
- tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
- tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
- chargingStandardService.save(tjChargingStandard);
- }
- }
-
- @Override
- @Async("async")
- public void dockerSetCustomerLisByRedis(List<Long> ksproList, String ksId) {
- List<TjCustomer> yjAjaxResult = getYjAjaxResult(ksproList);
- List<TjCustomer> wjAjaxResult = getWjAjaxResult(ksproList);
- redisCache.setCacheMapValue(ksId + "ks", "wj",wjAjaxResult);
- redisCache.setCacheMapValue(ksId + "ks", "yj",yjAjaxResult);
- }
-
- @Override
- @Async("async")
- public void checkSetCustomerLisByRedis(String config) {
- List<TjCustomer> wsResult = getWsResult(config);
- List<TjCustomer> ysResult = getYsResult(config);
- redisCache.setCacheMapValue("check", "ws",wsResult);
- redisCache.setCacheMapValue("check", "ys",ysResult);
- }
-
- @Override
- @Async("async")
- public void wCScheckSetCustomerLisByRedis( List<TjOrder> orderList) {
- List<TjCustomer> customerList = new ArrayList<>();
- if(null !=orderList && orderList.size()>0){
- for (TjOrder tjOrder : orderList) {
- if (null != tjOrder) {
- TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
- if (customer == null) {
- continue;
- }
- customer.setCusName(hideCusName(customer.getCusName()));
- customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjOrder.getTjNumber());
- customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
- customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getCreateTime());
- customer.setFinishTime(tjOrder.getFinishTime());
- customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
- if (tjOrder.getFirmId() == null) {
- customer.setTjCompName("鏃�");
- } else {
- DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
- if (byId != null) {
- customer.setTjCompName(byId.getCnName());
- }
- }
- customerList.add(customer);
- }
- }
- }
- redisCache.setCacheMapValue("cScheck", "ws",customerList);
- }
-
- @Override
- @Async("async")
- public void yCScheckSetCustomerLisByRedis( List<TjOrder> orderList) {
- List<TjCustomer> customerList = new ArrayList<>();
- if(null !=orderList && orderList.size()>0){
- for (TjOrder tjOrder : orderList) {
- if (null != tjOrder) {
- TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
- if (customer == null) {
- continue;
- }
- customer.setCusName(hideCusName(customer.getCusName()));
- customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjOrder.getTjNumber());
- customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
- customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getCreateTime());
- customer.setFinishTime(tjOrder.getFinishTime());
- customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
- if (tjOrder.getFirmId() == null) {
- customer.setTjCompName("鏃�");
- } else {
- DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
- if (byId != null) {
- customer.setTjCompName(byId.getCnName());
- }
- }
- customerList.add(customer);
- }
- }
- }
- redisCache.setCacheMapValue("cScheck", "ys",customerList);
- }
-
-
- @Override
- @Async("async")
- public void tjRefund(List<TjProject> refundPros, String tjNum) {
- for (TjProject refundPro : refundPros) {
- LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjProject::getProParentId, refundPro.getProId());
- List<Long> collect = projectService.list(wq0).stream().map(TjProject::getProId).collect(Collectors.toList());
- LambdaQueryWrapper<TjSampling>wq1=new LambdaQueryWrapper<>();
- wq1.eq(TjSampling::getTjNum,tjNum);
- wq1.in(TjSampling::getProId,collect);
- List<TjSampling> list = samplingService.list(wq1);
- if(null !=list && list.size()>0) samplingService.removeByIds(list.stream().map(TjSampling::getId).collect(Collectors.toList()));
- LambdaQueryWrapper<TjSampling>wq2=new LambdaQueryWrapper<>();
- wq2.eq(TjSampling::getTjNum,tjNum);
- wq2.eq(TjSampling::getProId,refundPro.getProId());
- samplingService.remove(wq2);
- }
- }
-
- @Override
- @Async("async")
- public void saveSampling() {
- redisCache.setCacheMapValue("sampling", "yqs",getYWqsResult(0));
- redisCache.setCacheMapValue("sampling", "wqs",getYWqsResult(1));
- }
-
- @Override
- @Async("async")
- public void tjGoutAsync(List<QjDomainVo> domainVos,SysUser sysUser,Set<String> list) {
- for (QjDomainVo domainVo : domainVos) {
- TjOrderRemark remark = orderRemarkService.getById(domainVo.getRemarkId());
- TjOrder order = orderService.getOrderByTjNum(domainVo.getTjNumber());
- //缁欏純妫�琛ㄦ坊鍔犺褰�
- if(domainVo.getType().equals(2)){
- TjDiscardInspection td = new TjDiscardInspection();
- td.setProId(String.valueOf(remark.getProId()));
- td.setProName(projectService.selectTjProjectByProId(remark.getProId()).getProName());
- td.setCusId(String.valueOf(order.getUserId()));
- td.setCusName((tjCustomerService.getById(order.getUserId())).getCusName());
- td.setRegistrationTime(order.getCreateTime());
- td.setTjNum(domainVo.getTjNumber());
- td.setCreateBy(sysUser.getNickName());
- td.setCreateTime(new DateTime());
- td.setUpdateBy(sysUser.getNickName());
- td.setUpdateTime(new DateTime());
- td.setCreateId(String.valueOf(sysUser.getUserId()));
- td.setUpdateId(String.valueOf(sysUser.getUserId()));
- discardInspectionService.save(td);
- }
-
- LambdaQueryWrapper<TjProject>wq1=new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProParentId,remark.getProId());
- List<TjProject> projectList = projectService.list(wq1);
- if(null !=projectList && projectList.size()>0){
- List<Long> collect = projectList.stream().map(TjProject::getProId).collect(Collectors.toList());
- LambdaQueryWrapper<TjOrderDetail>wq2=new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId,order.getOrderId());
- wq2.in(TjOrderDetail::getProId,collect);
- List<TjOrderDetail> detailList = tjOrderDetailService.list(wq2);
- if(null !=detailList && detailList.size()>0){
- for (TjOrderDetail detail : detailList) {
- detail.setTjStatus(Long.valueOf(remark.getType()));
- if(null !=remark.getRemark()) detail.setRemark(domainVo.getRemark());
- if(null !=remark.getYqDeadline()) detail.setYqDeadline(remark.getYqDeadline());
- tjOrderDetailService.updateById(detail);
- }
- }
- }
- }
- if (list.size() > 0) {
- for (String s : list) {
- TjOrder tjOrder = orderService.getOrderByTjNum(s);
- if (null != tjOrder) {
- tjOrder.setStatus(TjConstants.TJ_DELAY);
- tjOrder.setFinishTime(null);
- tjOrder.setUpdateBy(sysUser.getNickName());
- tjOrder.setUpdateTime(new DateTime());
- tjOrder.setUpdateId(String.valueOf(sysUser.getUserId()));
- orderService.updateById(tjOrder);
- TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
- TjYqOrder yqOrder=new TjYqOrder();
- yqOrder.setTjNum(s);
- yqOrder.setCusName(customer.getCusName());
- yqOrder.setSex(String.valueOf(customer.getCusSex()));
- yqOrder.setAge(customer.getAge());
- yqOrder.setPhone(customer.getCusPhone());
- yqOrder.setYqTime(new Date());
- yqOrder.setOrderTime(tjOrder.getCreateTime());
- yqOrder.setProIds(orderRemarkService.getTjOrderRemarkProIdList(s));
- yqOrder.setEmilSend("0");
- yqOrder.setMsgSend("0");
- yqOrder.setCreateBy(sysUser.getNickName());
- yqOrder.setCreateTime(new DateTime());
- yqOrder.setUpdateBy(sysUser.getNickName());
- yqOrder.setUpdateTime(new DateTime());
- yqOrder.setCreateId(String.valueOf(sysUser.getUserId()));
- yqOrder.setUpdateId(String.valueOf(sysUser.getUserId()));
- yqOrderService.save(yqOrder);
- }
- }
- }
- }
-
- @Override
- @Async("async")
- public void addRedisTransitionPac(String cusId, Long pacId, List<TjPackageProject> ppList) {
- for (TjPackageProject tjPackageProject : ppList) {
- TjProject project = projectService.getById(tjPackageProject.getProId());
- if (null != project) {
- BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(),5,RoundingMode.DOWN);
- LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjProject::getProParentId, project.getProId());
- List<TjProject> tjProSonList = projectService.list(wq2);
- if (null != tjProSonList && tjProSonList.size() > 0) {
- 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.setCreateTime(new Date());
- tbTransition.setProType(tjProject.getProType());
- tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
- transitionService.save(tbTransition);
- }
-
- }
- }
- }
- }
-
- @Override
- @Async("async")
- public void saveRedisTransitionByPacId(String cusId, Long pacId,List<Long> proIds) {
- if(null != pacId){
- transitionService.saveRedisTransitionByPacId(cusId,pacId);
- }
- if(null != proIds && proIds.size() > 0){
- saveRedisTransitionByProId(cusId,proIds);
- }
- }
-
- @Override
- @Async("async")
- public void addRedisTransitionPro(String cusId, List<Long> proIds) {
- for (Long proId : proIds) {
- if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) && transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
- continue;
- }
- TjProject project = projectService.getById(proId);
- if (null != project) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProParentId, project.getProId());
- List<TjProject> tjProSonList = projectService.list(wq1);
- 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.setParentProId(proId);
- tbTransition.setParentProName(project.getProName());
- tbTransition.setProId(tjProject.getProId());
- tbTransition.setProName(tjProject.getProName());
- tbTransition.setCreateTime(new Date());
- tbTransition.setProType(tjProject.getProType());
- tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
- transitionService.save(tbTransition);
- }
- }
- }
- }
- }
-
- @Override
- @Async("async")
- public void getTjPackageList() {
-
- //鐢蜂汉
- getTjPackageListsByMan(tjPackageService.getTjPackageListByMan());
-
- //濂充汉
- getTjPackageListByWoMan(tjPackageService.getTjPackageListByWoMan());
-
- //鏈煡
- getTjPackageListByManAndWoMan(tjPackageService.list(new LambdaQueryWrapper<TjPackage>().eq(TjPackage::getPacStatus,0)));
- }
-
- @Override
- @Async("async")
- public void addNewReservationConfirm(List<TjReservation> rightList ) {
- if(null !=rightList && rightList.size()>0){
- for (TjReservation reservation : rightList) {
- transitionService.deletedTbTransitionByCusId(reservation.getIdCard());
- List<AddNewReservationConfirm> confirmList = groupingProService.getAddNewReservationConfirm(reservation.getGroupingId());
- if (null !=confirmList && confirmList.size()>0){
- for (AddNewReservationConfirm confirm : confirmList) {
- List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(reservation.getIdCard(),confirm.getPid());
- if (null != transitionss && transitionss.size() > 0) {
- continue;
- }
- TbTransition tbTransition = new TbTransition();
- tbTransition.setCusId(reservation.getIdCard());
- tbTransition.setPacId(null);
- if (null != confirm.getProPrice()) {
- tbTransition.setOrdPrice(confirm.getProPrice());
- tbTransition.setNowPrice(confirm.getProPrice().multiply(BigDecimal.valueOf(Long.parseLong(confirm.getLimits())).divide(BigDecimal.valueOf(10))));
- } else {
- tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
- tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
- }
- tbTransition.setParentProId(Long.valueOf(confirm.getProId()));
- tbTransition.setParentProName(confirm.getProName());
- tbTransition.setProId(Long.valueOf(confirm.getPid()));
- tbTransition.setProName(confirm.getPname());
- tbTransition.setCreateTime(new Date());
- transitionService.save(tbTransition);
- }
- }
- }
- }
- }
-
- @Override
- @Async("async")
- public void saveNewReservationConfirm(List<TjReservation> rightList) {
- long l = System.currentTimeMillis();
- if(null !=rightList && rightList.size()>0){
- //鍒涘缓绾跨▼姹�
- ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size());
- for (TjReservation reservation : rightList) {
- //鍒犻櫎涔嬪墠鐨勬暟鎹�
- transitionService.deletedTbTransitionByCusId(reservation.getIdCard());
- //鑾峰彇绾跨▼
- threadPool.execute(new Runnable() {
- @Override
- public void run() {
- try {
- transitionService.saveTemoTransitionByGroupingId(reservation.getIdCard(),reservation.getGroupingId());
-
- threadPool.shutdown();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
- }
- }
- long ll = System.currentTimeMillis();
-
- System.out.println("杩欐浠ｇ爜鎵ц鏃堕棿涓�"+ (ll-l));
- }
-
- private void getTjPackageListsByMan(List<TjPackage> tjPackageList) {
- if (null != tjPackageList && tjPackageList.size() > 0) {
- for (TjPackage aPackage : tjPackageList) {
- List<TjProject> tjProjectList = new ArrayList<>();
- List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
- StringBuilder allProName = new StringBuilder();
- String allSonName = null;
- if (null != pplist) {
- for (TjPackageProject packageProject : pplist) {
-// StringBuilder allSonProName = new StringBuilder();
- TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
- if (null != tjProject) {
- allProName.append(tjProject.getProName()).append("锛�");
-// List<TjProject> projects = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
- String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
-// for (TjProject project : projects) {
-// allSonProName.append(project.getProName()).append("锛�");
-// allSonName.append(project.getProName()).append("锛�");
-// tjProject.setAllSonProName(allSonProName.toString());
+// System.out.println("杩欐浠ｇ爜鏃堕棿"+(l-System.currentTimeMillis()));
+// }
+//
+// @Override
+// @Async("async")
+// public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer,SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
+//
+// tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
+//
+// boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+// if (!b){
+// List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjOrder.getGroupId()));
+// if(null !=proList && proList.size()>0){
+// for (TjGroupingPro groupingPro : proList) {
+// TjOrderDetail detail = new TjOrderDetail();
+//// if (null != transition.getPacId()) {
+//// detail.setProType(String.valueOf(transition.getPacId()));
+//// }
+// TjProject tjProject = projectService.selectTjProjectByProId(Long.valueOf(groupingPro.getProId()));
+// detail.setIsSampling(String.valueOf(tjProject.getIsSampling()));
+// detail.setOrderId(tjOrder.getOrderId());
+// detail.setProId(Long.valueOf(groupingPro.getProId()));
+// detail.setTjStatus(0L);
+// detail.setCreateBy(sysUser.getNickName());
+// detail.setCreateTime(new Date());
+// detail.setUpdateBy(sysUser.getNickName());
+// detail.setUpdateTime(new Date());
+// detail.setCreateId(String.valueOf(sysUser.getUserId()));
+// detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+// tjOrderDetailService.save(detail);
+// }
+// List<String> list = proList.stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
+// List<TjProject> projectList = projectService.list(new LambdaQueryWrapper<TjProject>().in(TjProject::getProParentId, list));
+// for (TjProject project : projectList) {
+// TjOrderDetail detail = new TjOrderDetail();
+// detail.setOrderId(tjOrder.getOrderId());
+// detail.setProId(project.getProId());
+// detail.setTjStatus(0L);
+// detail.setCreateBy(sysUser.getNickName());
+// detail.setCreateTime(new Date());
+// detail.setUpdateBy(sysUser.getNickName());
+// detail.setUpdateTime(new Date());
+// detail.setCreateId(String.valueOf(sysUser.getUserId()));
+// detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+// //鑾峰彇璇ラ」鐩殑榛樿鍊艰祴鍊肩粰缁撴灉
+// if(null !=project.getProDefault()){
+// detail.setProResult(project.getProDefault());
+// }else {
+// detail.setProResult(null);
+// }
+// detail.setIsSampling(String.valueOf(project.getIsSampling()));
+//
+// tjOrderDetailService.save(detail);
+// }
+// }
+// }
+//
+// //娣诲姞remark琛ㄦ暟鎹�
+// orderRemarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+//
+// //鍒ゆ柇鏄惁浜ら挶
+// if ("1".equals(tjOrder.getTjType())) {
+// if (null != tjReservation && tjReservation.getPayType() == 1) {
+// tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+// sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// }
+// }
+// if (tjFlowingWater.getPayStasus() == 1) {
+// tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+// sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// }
+//
+//// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
+//// if (list != null) {
+//// for (TjOrderDetail tjOrderDetail : list) {
+//// TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
+//// if(tjProject==null){
+//// continue;
+//// }
+//// tjOrderDetail.setProject(tjProject);
+//// if (tjProject.getProParentId() == 0) {
+//// TjOrderRemark tjOrderRemark = new TjOrderRemark();
+//// tjOrderRemark.setProId(tjProject.getProId());
+//// tjOrderRemark.setProName(tjProject.getProName());
+//// tjOrderRemark.setDeptId(tjProject.getDeptId());
+//// tjOrderRemark.setTjNumber(tjOrder.getTjNumber());
+//// tjOrderRemark.setCreateBy(sysUser.getNickName());
+//// tjOrderRemark.setCreateTime(new Date());
+//// tjOrderRemark.setUpdateBy(sysUser.getNickName());
+//// tjOrderRemark.setUpdateTime(new Date());
+//// tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+//// tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+//// orderRemarkService.save(tjOrderRemark);
+//// }
+//// if ("1".equals(tjOrder.getTjType())) {
+//// if (null != tjReservation && tjReservation.getPayType() == 1) {
+//// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+//// }
+//// }
+//// if(tjFlowingWater.getPayStasus()==1){
+//// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+//// }
+//// tjOrderDetailService.updateById(tjOrderDetail);
+//// }
+//// }
+// }
+//
+// @Override
+// @Async("async")
+// public void collectFees(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList, SysUser sysUser, String discount) {
+// orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
+// for (TbTransition transition : tbTransitionList) {
+// transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).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(new Date());
+// tjChargingStandard.setUpdateBy(sysUser.getNickName());
+// tjChargingStandard.setUpdateTime(new Date());
+// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+// chargingStandardService.save(tjChargingStandard);
+// }
+// }
+//
+// //鐖堕」
+// ArrayList<TbTransition> collect1 = tbTransitionList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbTransition::getParentProId))), ArrayList::new));
+// List<Long> parentProIds = collect1.stream().map(TbTransition::getParentProId).collect(Collectors.toList());
+// if (parentProIds.size() > 0) {
+// for (Long parentProId : parentProIds) {
+// TjProject parentProject = projectService.selectTjProjectByProId(parentProId);
+// if (null != parentProject) {
+// 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);
+// }
+// }
+// TjOrderRemark tjOrderRemark=new TjOrderRemark();
+// tjOrderRemark.setProId(parentProId);
+// tjOrderRemark.setProName(parentProject.getProName());
+// tjOrderRemark.setDeptId(parentProject.getDeptId());
+// tjOrderRemark.setTjNumber(order.getTjNumber());
+// tjOrderRemark.setCreateBy(sysUser.getNickName());
+// tjOrderRemark.setCreateTime(new Date());
+// tjOrderRemark.setUpdateBy(sysUser.getNickName());
+// tjOrderRemark.setUpdateTime(new Date());
+// tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+// orderRemarkService.save(tjOrderRemark);
+// }
+// }
+// }
+//
+// ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
+// for (TjConsumables tjConsumables : collect) {
+// TjChargingStandard tjChargingStandard = new TjChargingStandard();
+// tjChargingStandard.setTjNum(order.getTjNumber());
+// tjChargingStandard.setConsumablesId(tjConsumables.getId());
+// tjChargingStandard.setPrice(tjConsumables.getPrice());
+// tjChargingStandard.setProName(tjConsumables.getMakings());
+// tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
+// tjChargingStandard.setCompany(tjConsumables.getSpecifications());
+// tjChargingStandard.setCreateBy(sysUser.getNickName());
+// tjChargingStandard.setCreateTime(new Date());
+// tjChargingStandard.setUpdateBy(sysUser.getNickName());
+// tjChargingStandard.setUpdateTime(new Date());
+// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+// chargingStandardService.save(tjChargingStandard);
+// }
+//
+// LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrderDetail::getOrderId,order.getOrderId());
+// 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);
+// }
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void abandonCheck(String tjNumber, TjOrder tjOrder, List<TjOrderDetail> list, SysUser sysUser) {
+// for (TjOrderDetail tjOrderDetail : list) {
+// LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjProject::getProId, tjOrderDetail.getProId());
+// TjProject one = projectService.getOne(wq1);
+// if (one != null) {
+// if (one.getProParentId() != 0) {
+// tjOrderDetail.setTjStatus(2L);
+// tjOrderDetail.setProResult("寮冩");
+// tjOrderDetail.setUpdateTime(new DateTime());
+// tjOrderDetailService.updateById(tjOrderDetail);
+// } else {
+// tjOrderDetail.setTjStatus(1L);
+// tjOrderDetail.setUpdateTime(new DateTime());
+// tjOrderDetailService.updateById(tjOrderDetail);
+// }
+// //缁欏純妫�琛ㄦ坊鍔犺褰�
+// TjDiscardInspection td = new TjDiscardInspection();
+// td.setProId(String.valueOf(one.getProId()));
+// td.setProName(one.getProName());
+// td.setCusId(String.valueOf(tjOrder.getUserId()));
+// td.setCusName((tjCustomerService.getById(tjOrder.getUserId())).getCusName());
+// td.setRegistrationTime(tjOrder.getCreateTime());
+// td.setTjNum(tjNumber);
+// td.setCreateBy(sysUser.getNickName());
+// td.setCreateTime(new DateTime());
+// td.setUpdateBy(sysUser.getNickName());
+// td.setUpdateTime(new DateTime());
+// td.setCreateId(String.valueOf(sysUser.getUserId()));
+// td.setUpdateId(String.valueOf(sysUser.getUserId()));
+// discardInspectionService.save(td);
+// }
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order) {
+// for (TjOrderDetail detail : tjOrderDetailList) {
+// detail.setTjStatus(1L);
+// LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
+// wq0.eq(TjStandard::getProId, detail.getProId());
+// detail.setUpdateBy(sysUser.getNickName());
+// detail.setUpdateTime(new Date());
+// detail.setCreateId(String.valueOf(sysUser.getUserId()));
+// detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+// tjOrderDetailService.updateById(detail);
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
+// List<TjConsumables> list2 = new ArrayList<>();
+// String[] tjProIds = tjFlowingWater.getTjProIds();
+// for (String tjProId : tjProIds) {
+// TjProject project = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
+// TjOrderRemark tjOrderRemark=new TjOrderRemark();
+// tjOrderRemark.setProId(Long.valueOf(tjProId));
+// tjOrderRemark.setProName(project.getProName());
+// tjOrderRemark.setDeptId(project.getDeptId());
+// tjOrderRemark.setTjNumber(order.getTjNumber());
+// tjOrderRemark.setCreateBy(sysUser.getNickName());
+// tjOrderRemark.setCreateTime(new Date());
+// tjOrderRemark.setUpdateBy(sysUser.getNickName());
+// tjOrderRemark.setUpdateTime(new Date());
+// tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+// orderRemarkService.save(tjOrderRemark);
+// 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());
+// detail.setCreateTime(new Date());
+// detail.setUpdateBy(sysUser.getNickName());
+// detail.setUpdateTime(new Date());
+// detail.setCreateId(String.valueOf(sysUser.getUserId()));
+// detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+// tjOrderDetailService.save(detail);
+// for (Long proId : proIds) {
+// TjOrderDetail detail1 = new TjOrderDetail();
+// detail1.setTjStatus(0L);
+// detail1.setOrderId(tjFlowingWater.getOrderId());
+// detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// detail1.setProId(proId);
+// detail1.setIsAddition("Y");
+// detail.setCreateBy(sysUser.getNickName());
+// detail.setCreateTime(new Date());
+// detail.setUpdateBy(sysUser.getNickName());
+// detail.setUpdateTime(new Date());
+// detail.setCreateId(String.valueOf(sysUser.getUserId()));
+// detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+// tjOrderDetailService.save(detail1);
+// }
+// LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
+// wqq.in(TbTransition::getProId, proIds);
+// List<TbTransition> tbTransitionList = transitionService.list(wqq);
+// if (null != tbTransitionList && tbTransitionList.size() > 0) {
+// for (TbTransition transition : tbTransitionList) {
+// 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(new Date());
+// tjChargingStandard.setUpdateBy(sysUser.getNickName());
+// tjChargingStandard.setUpdateTime(new Date());
+// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+// chargingStandardService.save(tjChargingStandard);
+// }
+// }
+// //鐖堕」
+// TjProject parentProject = projectService.getById(tjProId);
+// if (null != parentProject) {
+// 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);
+// }
+// }
+// }
+// }
+// }
+// //鐖堕」鑰楁潗
+// ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
+// for (TjConsumables tjConsumables : collect) {
+// TjChargingStandard tjChargingStandard = new TjChargingStandard();
+// tjChargingStandard.setTjNum(order.getTjNumber());
+// tjChargingStandard.setConsumablesId(tjConsumables.getId());
+// tjChargingStandard.setPrice(tjConsumables.getPrice());
+// tjChargingStandard.setProName(tjConsumables.getMakings());
+// tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
+// tjChargingStandard.setCompany(tjConsumables.getSpecifications());
+// tjChargingStandard.setCreateBy(sysUser.getNickName());
+// tjChargingStandard.setCreateTime(new Date());
+// tjChargingStandard.setUpdateBy(sysUser.getNickName());
+// tjChargingStandard.setUpdateTime(new Date());
+// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+// chargingStandardService.save(tjChargingStandard);
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void dockerSetCustomerLisByRedis(List<Long> ksproList, String ksId) {
+// List<TjCustomer> yjAjaxResult = getYjAjaxResult(ksproList);
+// List<TjCustomer> wjAjaxResult = getWjAjaxResult(ksproList);
+// redisCache.setCacheMapValue(ksId + "ks", "wj",wjAjaxResult);
+// redisCache.setCacheMapValue(ksId + "ks", "yj",yjAjaxResult);
+// }
+//
+// @Override
+// @Async("async")
+// public void checkSetCustomerLisByRedis(String config) {
+// List<TjCustomer> wsResult = getWsResult(config);
+// List<TjCustomer> ysResult = getYsResult(config);
+// redisCache.setCacheMapValue("check", "ws",wsResult);
+// redisCache.setCacheMapValue("check", "ys",ysResult);
+// //鏌ヨ
+// }
+//
+// @Override
+// @Async("async")
+// public void wCScheckSetCustomerLisByRedis( List<TjOrder> orderList) {
+// List<TjCustomer> customerList = new ArrayList<>();
+// if(null !=orderList && orderList.size()>0){
+// for (TjOrder tjOrder : orderList) {
+// if (null != tjOrder) {
+// TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+// if (customer == null) {
+// continue;
+// }
+// customer.setCusName(hideCusName(customer.getCusName()));
+// customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+// customer.setTjNumber(tjOrder.getTjNumber());
+// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+// customer.setOrderId(tjOrder.getOrderId());
+// customer.setTjTime(tjOrder.getCreateTime());
+// customer.setFinishTime(tjOrder.getFinishTime());
+// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+// if (tjOrder.getFirmId() == null) {
+// customer.setTjCompName("鏃�");
+// } else {
+// DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
+// if (byId != null) {
+// customer.setTjCompName(byId.getCnName());
+// }
+// }
+// customerList.add(customer);
+// }
+// }
+// }
+// redisCache.setCacheMapValue("cScheck", "ws",customerList);
+// }
+//
+// @Override
+// @Async("async")
+// public void yCScheckSetCustomerLisByRedis( List<TjOrder> orderList) {
+// List<TjCustomer> customerList = new ArrayList<>();
+// if(null !=orderList && orderList.size()>0){
+// for (TjOrder tjOrder : orderList) {
+// if (null != tjOrder) {
+// TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+// if (customer == null) {
+// continue;
+// }
+// customer.setCusName(hideCusName(customer.getCusName()));
+// customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+// customer.setTjNumber(tjOrder.getTjNumber());
+// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+// customer.setOrderId(tjOrder.getOrderId());
+// customer.setTjTime(tjOrder.getCreateTime());
+// customer.setFinishTime(tjOrder.getFinishTime());
+// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+// if (tjOrder.getFirmId() == null) {
+// customer.setTjCompName("鏃�");
+// } else {
+// DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
+// if (byId != null) {
+// customer.setTjCompName(byId.getCnName());
+// }
+// }
+// customerList.add(customer);
+// }
+// }
+// }
+// redisCache.setCacheMapValue("cScheck", "ys",customerList);
+// }
+//
+//
+// @Override
+// @Async("async")
+// public void tjRefund(List<TjProject> refundPros, String tjNum) {
+// for (TjProject refundPro : refundPros) {
+// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
+// wq0.eq(TjProject::getProParentId, refundPro.getProId());
+// List<Long> collect = projectService.list(wq0).stream().map(TjProject::getProId).collect(Collectors.toList());
+// LambdaQueryWrapper<TjSampling>wq1=new LambdaQueryWrapper<>();
+// wq1.eq(TjSampling::getTjNum,tjNum);
+// wq1.in(TjSampling::getProId,collect);
+// List<TjSampling> list = samplingService.list(wq1);
+// if(null !=list && list.size()>0) samplingService.removeByIds(list.stream().map(TjSampling::getId).collect(Collectors.toList()));
+// LambdaQueryWrapper<TjSampling>wq2=new LambdaQueryWrapper<>();
+// wq2.eq(TjSampling::getTjNum,tjNum);
+// wq2.eq(TjSampling::getProId,refundPro.getProId());
+// samplingService.remove(wq2);
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void saveSampling() {
+// redisCache.setCacheMapValue("sampling", "yqs",getYWqsResult(0));
+// redisCache.setCacheMapValue("sampling", "wqs",getYWqsResult(1));
+// }
+//
+// @Override
+// @Async("async")
+// public void tjGoutAsync(List<QjDomainVo> domainVos,SysUser sysUser,Set<String> list) {
+// for (QjDomainVo domainVo : domainVos) {
+// TjOrderRemark remark = orderRemarkService.getById(domainVo.getRemarkId());
+// TjOrder order = orderService.getOrderByTjNum(domainVo.getTjNumber());
+// //缁欏純妫�琛ㄦ坊鍔犺褰�
+// if(domainVo.getType().equals(2)){
+// TjDiscardInspection td = new TjDiscardInspection();
+// td.setProId(String.valueOf(remark.getProId()));
+// td.setProName(projectService.selectTjProjectByProId(remark.getProId()).getProName());
+// td.setCusId(String.valueOf(order.getUserId()));
+// td.setCusName((tjCustomerService.getById(order.getUserId())).getCusName());
+// td.setRegistrationTime(order.getCreateTime());
+// td.setTjNum(domainVo.getTjNumber());
+// td.setCreateBy(sysUser.getNickName());
+// td.setCreateTime(new DateTime());
+// td.setUpdateBy(sysUser.getNickName());
+// td.setUpdateTime(new DateTime());
+// td.setCreateId(String.valueOf(sysUser.getUserId()));
+// td.setUpdateId(String.valueOf(sysUser.getUserId()));
+// discardInspectionService.save(td);
+// }
+//
+// LambdaQueryWrapper<TjProject>wq1=new LambdaQueryWrapper<>();
+// wq1.eq(TjProject::getProParentId,remark.getProId());
+// List<TjProject> projectList = projectService.list(wq1);
+// if(null !=projectList && projectList.size()>0){
+// List<Long> collect = projectList.stream().map(TjProject::getProId).collect(Collectors.toList());
+// LambdaQueryWrapper<TjOrderDetail>wq2=new LambdaQueryWrapper<>();
+// wq2.eq(TjOrderDetail::getOrderId,order.getOrderId());
+// wq2.in(TjOrderDetail::getProId,collect);
+// List<TjOrderDetail> detailList = tjOrderDetailService.list(wq2);
+// if(null !=detailList && detailList.size()>0){
+// for (TjOrderDetail detail : detailList) {
+// detail.setTjStatus(Long.valueOf(remark.getType()));
+// if(null !=remark.getRemark()) detail.setRemark(domainVo.getRemark());
+// if(null !=remark.getYqDeadline()) detail.setYqDeadline(remark.getYqDeadline());
+// tjOrderDetailService.updateById(detail);
+// }
+// }
+// }
+// }
+// if (list.size() > 0) {
+// for (String s : list) {
+// TjOrder tjOrder = orderService.getOrderByTjNum(s);
+// if (null != tjOrder) {
+// tjOrder.setStatus(TjConstants.TJ_DELAY);
+// tjOrder.setFinishTime(null);
+// tjOrder.setUpdateBy(sysUser.getNickName());
+// tjOrder.setUpdateTime(new DateTime());
+// tjOrder.setUpdateId(String.valueOf(sysUser.getUserId()));
+// orderService.updateById(tjOrder);
+// TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+// TjYqOrder yqOrder=new TjYqOrder();
+// yqOrder.setTjNum(s);
+// yqOrder.setCusName(customer.getCusName());
+// yqOrder.setSex(String.valueOf(customer.getCusSex()));
+// yqOrder.setAge(customer.getAge());
+// yqOrder.setPhone(customer.getCusPhone());
+// yqOrder.setYqTime(new Date());
+// yqOrder.setOrderTime(tjOrder.getCreateTime());
+// yqOrder.setProIds(orderRemarkService.getTjOrderRemarkProIdList(s));
+// yqOrder.setEmilSend("0");
+// yqOrder.setMsgSend("0");
+// yqOrder.setCreateBy(sysUser.getNickName());
+// yqOrder.setCreateTime(new DateTime());
+// yqOrder.setUpdateBy(sysUser.getNickName());
+// yqOrder.setUpdateTime(new DateTime());
+// yqOrder.setCreateId(String.valueOf(sysUser.getUserId()));
+// yqOrder.setUpdateId(String.valueOf(sysUser.getUserId()));
+// yqOrderService.save(yqOrder);
+// }
+// }
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void addRedisTransitionPac(String cusId, Long pacId, List<TjPackageProject> ppList) {
+// for (TjPackageProject tjPackageProject : ppList) {
+// TjProject project = projectService.getById(tjPackageProject.getProId());
+// if (null != project) {
+// BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(),5,RoundingMode.DOWN);
+// LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjProject::getProParentId, project.getProId());
+// List<TjProject> tjProSonList = projectService.list(wq2);
+// if (null != tjProSonList && tjProSonList.size() > 0) {
+// 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.setCreateTime(new Date());
+// tbTransition.setProType(tjProject.getProType());
+// tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
+// transitionService.save(tbTransition);
+// }
+//
+// }
+// }
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void saveRedisTransitionByPacId(String cusId, Long pacId,List<Long> proIds) {
+// if(null != pacId){
+// transitionService.saveRedisTransitionByPacId(cusId,pacId);
+// }
+// if(null != proIds && proIds.size() > 0){
+// saveRedisTransitionByProId(cusId,proIds);
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void addRedisTransitionPro(String cusId, List<Long> proIds) {
+// for (Long proId : proIds) {
+// if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) && transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
+// continue;
+// }
+// TjProject project = projectService.getById(proId);
+// if (null != project) {
+// LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjProject::getProParentId, project.getProId());
+// List<TjProject> tjProSonList = projectService.list(wq1);
+// 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.setParentProId(proId);
+// tbTransition.setParentProName(project.getProName());
+// tbTransition.setProId(tjProject.getProId());
+// tbTransition.setProName(tjProject.getProName());
+// tbTransition.setCreateTime(new Date());
+// tbTransition.setProType(tjProject.getProType());
+// tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
+// transitionService.save(tbTransition);
+// }
+// }
+// }
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void getTjPackageList() {
+//
+// //鐢蜂汉
+// getTjPackageListsByMan(tjPackageService.getTjPackageListByMan());
+//
+// //濂充汉
+// getTjPackageListByWoMan(tjPackageService.getTjPackageListByWoMan());
+//
+// //鏈煡
+// getTjPackageListByManAndWoMan(tjPackageService.list(new LambdaQueryWrapper<TjPackage>().eq(TjPackage::getPacStatus,0)));
+// }
+//
+// @Override
+// @Async("async")
+// public void addNewReservationConfirm(List<TjReservation> rightList ) {
+// if(null !=rightList && rightList.size()>0){
+// for (TjReservation reservation : rightList) {
+// transitionService.deletedTbTransitionByCusId(reservation.getIdCard());
+// List<AddNewReservationConfirm> confirmList = groupingProService.getAddNewReservationConfirm(reservation.getGroupingId());
+// if (null !=confirmList && confirmList.size()>0){
+// for (AddNewReservationConfirm confirm : confirmList) {
+// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(reservation.getIdCard(),confirm.getPid());
+// if (null != transitionss && transitionss.size() > 0) {
+// continue;
+// }
+// TbTransition tbTransition = new TbTransition();
+// tbTransition.setCusId(reservation.getIdCard());
+// tbTransition.setPacId(null);
+// if (null != confirm.getProPrice()) {
+// tbTransition.setOrdPrice(confirm.getProPrice());
+// tbTransition.setNowPrice(confirm.getProPrice().multiply(BigDecimal.valueOf(Long.parseLong(confirm.getLimits())).divide(BigDecimal.valueOf(10))));
+// } else {
+// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
+// tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
+// }
+// tbTransition.setParentProId(Long.valueOf(confirm.getProId()));
+// tbTransition.setParentProName(confirm.getProName());
+// tbTransition.setProId(Long.valueOf(confirm.getPid()));
+// tbTransition.setProName(confirm.getPname());
+// tbTransition.setCreateTime(new Date());
+// transitionService.save(tbTransition);
+// }
+// }
+// }
+// }
+// }
+//
+// @Override
+// @Async("async")
+// public void saveNewReservationConfirm(List<TjReservation> rightList) {
+// long l = System.currentTimeMillis();
+// if(null !=rightList && rightList.size()>0){
+// //鍒涘缓绾跨▼姹�
+// ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size());
+// for (TjReservation reservation : rightList) {
+// //鍒犻櫎涔嬪墠鐨勬暟鎹�
+// transitionService.deletedTbTransitionByCusId(reservation.getIdCard());
+// //鑾峰彇绾跨▼
+// threadPool.execute(new Runnable() {
+// @Override
+// public void run() {
+// try {
+// transitionService.saveTemoTransitionByGroupingId(reservation.getIdCard(),reservation.getGroupingId());
+//
+// threadPool.shutdown();
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// });
+// }
+// }
+// long ll = System.currentTimeMillis();
+//
+// System.out.println("杩欐浠ｇ爜鎵ц鏃堕棿涓�"+ (ll-l));
+// }
+//
+// private void getTjPackageListsByMan(List<TjPackage> tjPackageList) {
+// if (null != tjPackageList && tjPackageList.size() > 0) {
+// for (TjPackage aPackage : tjPackageList) {
+// List<TjProject> tjProjectList = new ArrayList<>();
+// List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
+// StringBuilder allProName = new StringBuilder();
+// String allSonName = null;
+// if (null != pplist) {
+// for (TjPackageProject packageProject : pplist) {
+//// StringBuilder allSonProName = new StringBuilder();
+// TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
+// if (null != tjProject) {
+// allProName.append(tjProject.getProName()).append("锛�");
+//// List<TjProject> projects = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
+// String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
+//// for (TjProject project : projects) {
+//// allSonProName.append(project.getProName()).append("锛�");
+//// allSonName.append(project.getProName()).append("锛�");
+//// tjProject.setAllSonProName(allSonProName.toString());
+//// }
+// allSonName = name;
+// tjProject.setAllSonProName(name);
+// tjProjectList.add(tjProject);
+//// List<TjProConsumables> list = tjProConsumablesService.list(packageProject.getProId());
+//// List<TjConsumables> list1 = new ArrayList<>();
+//// for (TjProConsumables tjProConsumables : list) {
+//// list1.add(tjConsumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()));
+//// }
+// List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
+// tjProject.setConsumablesList(list1);
+// }
+// }
+// }
+// aPackage.setTjProjectList(tjProjectList);
+// aPackage.setAllProName(allProName.toString());
+// aPackage.setAllSonName(allSonName);
+// }
+// if(redisCache.hasKey("getTjPackageListBySex")){
+// redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByMan");
+// }
+// redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByMan",tjPackageList);
+// }
+// }
+// private void getTjPackageListByWoMan(List<TjPackage> tjPackageList) {
+// if (null != tjPackageList && tjPackageList.size() > 0) {
+// for (TjPackage aPackage : tjPackageList) {
+// List<TjProject> tjProjectList = new ArrayList<>();
+// List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
+// StringBuilder allProName = new StringBuilder();
+// String allSonName = null;
+// if (null != pplist) {
+// for (TjPackageProject packageProject : pplist) {
+//// StringBuilder allSonProName = new StringBuilder();
+// TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
+// if (null != tjProject) {
+// allProName.append(tjProject.getProName()).append("锛�");
+//// List<TjProject> projects = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
+// String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
+//// for (TjProject project : projects) {
+//// allSonProName.append(project.getProName()).append("锛�");
+//// allSonName.append(project.getProName()).append("锛�");
+//// tjProject.setAllSonProName(allSonProName.toString());
+//// }
+// allSonName = name;
+// tjProject.setAllSonProName(name);
+// tjProjectList.add(tjProject);
+//// List<TjProConsumables> list = tjProConsumablesService.list(packageProject.getProId());
+//// List<TjConsumables> list1 = new ArrayList<>();
+//// for (TjProConsumables tjProConsumables : list) {
+//// list1.add(tjConsumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()));
+//// }
+// List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
+// tjProject.setConsumablesList(list1);
+// }
+// }
+// }
+// aPackage.setTjProjectList(tjProjectList);
+// aPackage.setAllProName(allProName.toString());
+// aPackage.setAllSonName(allSonName);
+// }
+// if(redisCache.hasKey("getTjPackageListBySex")){
+// redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByWoMan");
+// }
+// redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByWoMan",tjPackageList);
+// }
+// }
+// private void getTjPackageListByManAndWoMan(List<TjPackage> tjPackageList) {
+// if (null != tjPackageList && tjPackageList.size() > 0) {
+// for (TjPackage aPackage : tjPackageList) {
+// List<TjProject> tjProjectList = new ArrayList<>();
+// List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
+// StringBuilder allProName = new StringBuilder();
+// String allSonName = null;
+// if (null != pplist) {
+// for (TjPackageProject packageProject : pplist) {
+// TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
+// if (null != tjProject) {
+// allProName.append(tjProject.getProName()).append("锛�");
+// String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
+// allSonName = name;
+// tjProject.setAllSonProName(name);
+// tjProjectList.add(tjProject);
+// List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
+// tjProject.setConsumablesList(list1);
+// }
+// }
+// }
+// aPackage.setTjProjectList(tjProjectList);
+// aPackage.setAllProName(allProName.toString());
+// aPackage.setAllSonName(allSonName);
+// }
+// if(redisCache.hasKey("getTjPackageListBySex")){
+// redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByManAndWoMan");
+// }
+// redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByManAndWoMan",tjPackageList);
+// }
+// }
+//
+//
+// //宸叉
+// public List<TjCustomer> getYjAjaxResult(List<Long> ksproList) {
+// List<TjCustomer> customerLis = new ArrayList<>();
+// LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjOrderDetail::getTjStatus, 1);
+// wq1.in(TjOrderDetail::getProId, ksproList);
+// wq1.isNotNull(TjOrderDetail::getFlowingWaterId);
+// wq1.orderByDesc(TjOrderDetail::getCreateTime);
+// List<TjOrderDetail> detailList = tjOrderDetailService.list(wq1);
+// if (null != detailList && detailList.size() > 0) {
+// //鏀堕泦orderId骞跺幓閲�
+// List<Long> orderIds = detailList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
+// () -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
+// ), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
+// for (Long orderId : orderIds) {
+// if (null != orderId) {
+// TjOrder order = orderService.getById(orderId);
+// if(null ==order){
+// continue;
+// }
+// LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
+// qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
+// qww.eq(TjOrderDetail::getTjStatus, 0);
+// qww.isNotNull(TjOrderDetail::getFlowingWaterId);
+// List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
+// if (null != lists && lists.size() > 0) {
+// continue;
+// }
+//
+// TjCustomer customer = tjCustomerService.getById(order.getUserId());
+// if (null != customer) {
+// customer.setCusName(hideCusName(customer.getCusName()));
+// customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+// if (order.getTjType().equals("1")) {
+// customer.setTjType("鍥綋");
+// }
+// if (order.getTjType().equals("2")) {
+// customer.setTjType("涓汉");
+// }
+// customer.setTjTime(order.getCreateTime());
+// customer.setTjNumber(order.getTjNumber());
+// customer.setTjStatus(1L);
+// LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+// wq.in(TjOrderRemark::getType, 0,3);
+// List<TjOrderRemark> list = orderRemarkService.list(wq);
+// if (null != list && list.size() > 0) {
+// StringBuilder stringBuilder = new StringBuilder();
+// for (TjOrderRemark remark : list) {
+// TjProject byId = projectService.getById(remark.getProId());
+// stringBuilder.append(byId.getProName()).append(";");
// }
- allSonName = name;
- tjProject.setAllSonProName(name);
- tjProjectList.add(tjProject);
-// List<TjProConsumables> list = tjProConsumablesService.list(packageProject.getProId());
-// List<TjConsumables> list1 = new ArrayList<>();
-// for (TjProConsumables tjProConsumables : list) {
-// list1.add(tjConsumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()));
+// customer.setNotCheckeds(String.valueOf(stringBuilder));
+// if(null ==customer.getNotCheckeds())customer.setNotCheckeds("鍏ㄩ儴宸叉");
+// }
+// customerLis.add(customer);
+// }
+// }
+// }
+// }
+// return customerLis;
+// }
+//
+// //鏈
+// public List<TjCustomer> getWjAjaxResult(List<Long> ksproList) {
+// List<TjCustomer> customerLis = new ArrayList<>();
+// LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjOrderDetail::getTjStatus, 0);
+// wq1.in(TjOrderDetail::getProId, ksproList);
+// wq1.isNotNull(TjOrderDetail::getFlowingWaterId);
+// wq1.orderByDesc(TjOrderDetail::getCreateTime);
+// List<TjOrderDetail> detailList = tjOrderDetailService.list(wq1);
+// if (null != detailList && detailList.size() > 0) {
+// //鏀堕泦orderId骞跺幓閲�
+// List<Long> orderIds = detailList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
+// () -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
+// ), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
+// for (Long orderId : orderIds) {
+// if (null != orderId) {
+// TjOrder order = orderService.getById(orderId);
+// if(null ==order){
+// continue;
+// }
+// TjCustomer customer = tjCustomerService.getById(order.getUserId());
+// if (null != customer) {
+// customer.setCusName(hideCusName(customer.getCusName()));
+// customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+//
+// if (order.getTjType().equals("1")) {
+// customer.setTjType("鍥綋");
+// }
+// if (order.getTjType().equals("2")) {
+// customer.setTjType("涓汉");
+// }
+// customer.setTjTime(order.getCreateTime());
+// customer.setTjNumber(order.getTjNumber());
+// customer.setTjStatus(0L);
+// LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+// wq.in(TjOrderRemark::getType, 0,3);
+// List<TjOrderRemark> list = orderRemarkService.list(wq);
+// if (null != list && list.size() > 0) {
+// StringBuilder stringBuilder = new StringBuilder();
+// for (TjOrderRemark remark : list) {
+// TjProject byId = projectService.getById(remark.getProId());
+// stringBuilder.append(byId.getProName()).append(";");
// }
- List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
- tjProject.setConsumablesList(list1);
- }
- }
- }
- aPackage.setTjProjectList(tjProjectList);
- aPackage.setAllProName(allProName.toString());
- aPackage.setAllSonName(allSonName);
- }
- if(redisCache.hasKey("getTjPackageListBySex")){
- redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByMan");
- }
- redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByMan",tjPackageList);
- }
- }
- private void getTjPackageListByWoMan(List<TjPackage> tjPackageList) {
- if (null != tjPackageList && tjPackageList.size() > 0) {
- for (TjPackage aPackage : tjPackageList) {
- List<TjProject> tjProjectList = new ArrayList<>();
- List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
- StringBuilder allProName = new StringBuilder();
- String allSonName = null;
- if (null != pplist) {
- for (TjPackageProject packageProject : pplist) {
-// StringBuilder allSonProName = new StringBuilder();
- TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
- if (null != tjProject) {
- allProName.append(tjProject.getProName()).append("锛�");
-// List<TjProject> projects = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
- String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
-// for (TjProject project : projects) {
-// allSonProName.append(project.getProName()).append("锛�");
-// allSonName.append(project.getProName()).append("锛�");
-// tjProject.setAllSonProName(allSonProName.toString());
-// }
- allSonName = name;
- tjProject.setAllSonProName(name);
- tjProjectList.add(tjProject);
-// List<TjProConsumables> list = tjProConsumablesService.list(packageProject.getProId());
-// List<TjConsumables> list1 = new ArrayList<>();
-// for (TjProConsumables tjProConsumables : list) {
-// list1.add(tjConsumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()));
-// }
- List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
- tjProject.setConsumablesList(list1);
- }
- }
- }
- aPackage.setTjProjectList(tjProjectList);
- aPackage.setAllProName(allProName.toString());
- aPackage.setAllSonName(allSonName);
- }
- if(redisCache.hasKey("getTjPackageListBySex")){
- redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByWoMan");
- }
- redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByWoMan",tjPackageList);
- }
- }
- private void getTjPackageListByManAndWoMan(List<TjPackage> tjPackageList) {
- if (null != tjPackageList && tjPackageList.size() > 0) {
- for (TjPackage aPackage : tjPackageList) {
- List<TjProject> tjProjectList = new ArrayList<>();
- List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
- StringBuilder allProName = new StringBuilder();
- String allSonName = null;
- if (null != pplist) {
- for (TjPackageProject packageProject : pplist) {
- TjProject tjProject = projectService.selectTjProjectByProId(packageProject.getProId());
- if (null != tjProject) {
- allProName.append(tjProject.getProName()).append("锛�");
- String name = projectService.appendTjProjectName(String.valueOf(packageProject.getProId()));
- allSonName = name;
- tjProject.setAllSonProName(name);
- tjProjectList.add(tjProject);
- List<TjConsumables> list1 = consumablesService.getTjConsumablesList(String.valueOf(packageProject.getProId()));
- tjProject.setConsumablesList(list1);
- }
- }
- }
- aPackage.setTjProjectList(tjProjectList);
- aPackage.setAllProName(allProName.toString());
- aPackage.setAllSonName(allSonName);
- }
- if(redisCache.hasKey("getTjPackageListBySex")){
- redisCache.deleteCacheMapValue("getTjPackageListBySex","getTjPackageListByManAndWoMan");
- }
- redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByManAndWoMan",tjPackageList);
- }
- }
-
-
- //宸叉
- public List<TjCustomer> getYjAjaxResult(List<Long> ksproList) {
- List<TjCustomer> customerLis = new ArrayList<>();
- LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrderDetail::getTjStatus, 1);
- wq1.in(TjOrderDetail::getProId, ksproList);
- wq1.isNotNull(TjOrderDetail::getFlowingWaterId);
- wq1.orderByDesc(TjOrderDetail::getCreateTime);
- List<TjOrderDetail> detailList = tjOrderDetailService.list(wq1);
- if (null != detailList && detailList.size() > 0) {
- //鏀堕泦orderId骞跺幓閲�
- List<Long> orderIds = detailList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
- () -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
- ), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
- for (Long orderId : orderIds) {
- if (null != orderId) {
- TjOrder order = orderService.getById(orderId);
- if(null ==order){
- continue;
- }
- LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
- qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
- qww.eq(TjOrderDetail::getTjStatus, 0);
- qww.isNotNull(TjOrderDetail::getFlowingWaterId);
- List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
- if (null != lists && lists.size() > 0) {
- continue;
- }
-
- TjCustomer customer = tjCustomerService.getById(order.getUserId());
- if (null != customer) {
- customer.setCusName(hideCusName(customer.getCusName()));
- customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
- if (order.getTjType().equals("1")) {
- customer.setTjType("鍥綋");
- }
- if (order.getTjType().equals("2")) {
- customer.setTjType("涓汉");
- }
- customer.setTjTime(order.getCreateTime());
- customer.setTjNumber(order.getTjNumber());
- customer.setTjStatus(1L);
- LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
- wq.in(TjOrderRemark::getType, 0,3);
- List<TjOrderRemark> list = orderRemarkService.list(wq);
- if (null != list && list.size() > 0) {
- StringBuilder stringBuilder = new StringBuilder();
- for (TjOrderRemark remark : list) {
- TjProject byId = projectService.getById(remark.getProId());
- stringBuilder.append(byId.getProName()).append(";");
- }
- customer.setNotCheckeds(String.valueOf(stringBuilder));
- if(null ==customer.getNotCheckeds())customer.setNotCheckeds("鍏ㄩ儴宸叉");
- }
- customerLis.add(customer);
- }
- }
- }
- }
- return customerLis;
- }
-
- //鏈
- public List<TjCustomer> getWjAjaxResult(List<Long> ksproList) {
- List<TjCustomer> customerLis = new ArrayList<>();
- LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrderDetail::getTjStatus, 0);
- wq1.in(TjOrderDetail::getProId, ksproList);
- wq1.isNotNull(TjOrderDetail::getFlowingWaterId);
- wq1.orderByDesc(TjOrderDetail::getCreateTime);
- List<TjOrderDetail> detailList = tjOrderDetailService.list(wq1);
- if (null != detailList && detailList.size() > 0) {
- //鏀堕泦orderId骞跺幓閲�
- List<Long> orderIds = detailList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
- () -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
- ), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
- for (Long orderId : orderIds) {
- if (null != orderId) {
- TjOrder order = orderService.getById(orderId);
- if(null ==order){
- continue;
- }
- TjCustomer customer = tjCustomerService.getById(order.getUserId());
- if (null != customer) {
- customer.setCusName(hideCusName(customer.getCusName()));
- customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
-
- if (order.getTjType().equals("1")) {
- customer.setTjType("鍥綋");
- }
- if (order.getTjType().equals("2")) {
- customer.setTjType("涓汉");
- }
- customer.setTjTime(order.getCreateTime());
- customer.setTjNumber(order.getTjNumber());
- customer.setTjStatus(0L);
- LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
- wq.in(TjOrderRemark::getType, 0,3);
- List<TjOrderRemark> list = orderRemarkService.list(wq);
- if (null != list && list.size() > 0) {
- StringBuilder stringBuilder = new StringBuilder();
- for (TjOrderRemark remark : list) {
- TjProject byId = projectService.getById(remark.getProId());
- stringBuilder.append(byId.getProName()).append(";");
- }
- customer.setNotCheckeds(String.valueOf(stringBuilder));
- if(null ==customer.getNotCheckeds())customer.setNotCheckeds("鍏ㄩ儴宸叉");
- }
- customerLis.add(customer);
- }
- }
- }
- }
- return customerLis;
- }
-
- //宸插
- private List<TjCustomer> getYsResult(String config) {
- List<TjOrder> orderList = null;
- if("Y".equals(config)){
- orderList = orderService.getCsTjOrderList1(null,1,null,null,null);
- }else {
- orderList = orderService.getTjOrderList(null,1,null,null,null);
- }
- List<TjCustomer> customerList = new ArrayList<>();
- if(null !=orderList && orderList.size()>0){
- for (TjOrder tjOrder : orderList) {
- if (null != tjOrder) {
- TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
- if (customer == null) {
- continue;
- }
- customer.setCusName(hideCusName(customer.getCusName()));
- customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjOrder.getTjNumber());
- customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
- customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getCreateTime());
- customer.setFinishTime(tjOrder.getFinishTime());
- customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
- if (tjOrder.getFirmId() == null) {
- customer.setTjCompName("鏃�");
- } else {
- DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
- if (byId != null) {
- customer.setTjCompName(byId.getCnName());
- }
- }
- customerList.add(customer);
- }
- }
- }
- return customerList;
- }
-
- //鏈
- private List<TjCustomer> getWsResult(String config) {
- List<TjOrder> orderList = null;
- if("Y".equals(config)){
- orderList = orderService.getCsTjOrderList1(null,0,null,null,null);
- }else {
- orderList = orderService.getTjOrderList(null,0,null,null,null);
- }
- List<TjCustomer> customerList = new ArrayList<>();
- if(null !=orderList && orderList.size()>0) {
- for (TjOrder tjOrder : orderList) {
- if (null != tjOrder) {
- TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
- if (customer == null) {
- continue;
- }
- customer.setCusName(hideCusName(customer.getCusName()));
- customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjOrder.getTjNumber());
- customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
- customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getCreateTime());
- customer.setFinishTime(tjOrder.getFinishTime());
- customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
- if (tjOrder.getFirmId() == null) {
- customer.setTjCompName("鏃�");
- } else {
- DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
- if (byId != null) {
- customer.setTjCompName(byId.getCnName());
- }
- }
- customerList.add(customer);
- }
- }
- }
- return customerList;
- }
-
- //宸茬鏀�/鏈鏀�
- private List<Map<String, Object>> getYWqsResult(int a) {
- LambdaQueryWrapper<TjSampling>wq=new LambdaQueryWrapper<>();
- List<Map<String,Object>> arrayList=new ArrayList<>();
- wq.orderByDesc(TjSampling::getApplicationTime);
- wq.eq(TjSampling::getIsSignFor,a);
- List<TjSampling> list = tjSamplingService.list(wq);
- if(null != list && list.size()>0 ){
- Map<String, List<TjSampling>> stringListMap = list.stream().collect(Collectors.groupingBy(TjSampling::getCusId));
- for (Map.Entry<String, List<TjSampling>> entry : stringListMap.entrySet()) {
- Map<String,Object>map=new HashMap<>();
- TjCustomer customer = tjCustomerService.getById(entry.getKey());
- if (customer==null){
- continue;
- }
- customer.setCusName(hideCusName(customer.getCusName()));
- customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(entry.getValue().get(0).getTjNum());
- customer.setApplicationTime(entry.getValue().get(0).getApplicationTime());
- List<TjSampling> samplings = entry.getValue();
- if(null !=samplings && samplings.size()>0){
- List<TjSampling> projectList=new ArrayList<>();
- for (TjSampling sampling : samplings) {
- TjProject project = projectService.getById(sampling.getProId());
- if(null !=project && project.getProParentId()==0){
- projectList.add(sampling);
- }
- }
- map.put("list",projectList);
- }
- map.put("customer",customer);
- arrayList.add(map);
- }
- }
- return arrayList;
- }
-
-
- /**
- * 闅愯棌鎵嬫満鍙�
- *
- * @param phoneNum
- * @return
- */
- public static String hidePhoneNum(String phoneNum){
- if(phoneNum.contains("*")){
- return phoneNum;
- }
- Pattern pattern = Pattern.compile("((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}");
- Matcher matcher = pattern.matcher(phoneNum);
- StringBuffer sb = new StringBuffer();
- try {
- while(matcher.find()) {
- String phoneStr = matcher.group();
- phoneStr = phoneStr.substring(0, 3) + "****" + phoneStr.substring(7, phoneStr.length());
- matcher.appendReplacement(sb,phoneStr);
- }
- matcher.appendTail(sb);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return sb.toString();
- }
-
- /**
- * 闅愯棌韬唤璇佸彿鐮�
- *
- * @param idCardNum
- * @return
- */
- public static String hideIdCardNum(String idCardNum){
- if(idCardNum.contains("*")){
- return idCardNum;
- }
- Pattern pattern = Pattern.compile("(\\d{6})(19|20)(\\d{2})(1[0-2]|0[1-9])(0[1-9]|[1-2][0-9]|3[0-1])(\\d{3})(\\d|X|x)");
- Matcher matcher = pattern.matcher(idCardNum);
- StringBuffer sb = new StringBuffer();
- try {
- while(matcher.find()) {
- String idCardStr = matcher.group();
- int len=idCardStr.length();
- if(len>=9){
- idCardStr = idCardStr.replaceAll("(.{"+(len<12?3:6)+"})(.*)(.{4})", "$1" + "****" + "$3");
- }
- matcher.appendReplacement(sb,idCardStr);
- }
- matcher.appendTail(sb);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return sb.toString();
- }
-
-
- /**
- * 闅愯棌鐢ㄦ埛濮撳悕
- *
- * @param cusName
- * @return
- */
- public static String hideCusName(String cusName){
- if(!cusName.contains("*")){
- String realname=null;
- char[] r = cusName.toCharArray();
- if(r.length ==1){
- realname = cusName;
- }
- if(r.length == 2){
- realname = cusName.replaceFirst(cusName.substring(1),"*");
- }
- if (r.length > 2) {
- realname = cusName.replaceFirst(cusName.substring(1,r.length-1) ,"*");
- }
- return realname;
- }
- return cusName;
- }
-
-
- //涓存椂琛ㄦ坊鍔犲崟椤�
- public void saveRedisTransitionByProId(String cusId, List<Long> proIds) {
- for (Long proId : proIds) {
- if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) && transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
- continue;
- }
- transitionService.saveRedisTransitionByProId(cusId,proId);
- }
- }
-}
+// customer.setNotCheckeds(String.valueOf(stringBuilder));
+// if(null ==customer.getNotCheckeds())customer.setNotCheckeds("鍏ㄩ儴宸叉");
+// }
+// customerLis.add(customer);
+// }
+// }
+// }
+// }
+// return customerLis;
+// }
+//
+// //宸插
+// private List<TjCustomer> getYsResult(String config) {
+// List<TjOrder> orderList = null;
+// if("Y".equals(config)){
+// orderList = orderService.getCsTjOrderList1(null,1,null,null,null);
+// }else {
+// orderList = orderService.getTjOrderList(null,1,null,null,null);
+// }
+// List<TjCustomer> customerList = new ArrayList<>();
+// if(null !=orderList && orderList.size()>0){
+// for (TjOrder tjOrder : orderList) {
+// if (null != tjOrder) {
+// TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+// if (customer == null) {
+// continue;
+// }
+// customer.setCusName(hideCusName(customer.getCusName()));
+// customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+// customer.setTjNumber(tjOrder.getTjNumber());
+// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+// customer.setOrderId(tjOrder.getOrderId());
+// customer.setTjTime(tjOrder.getCreateTime());
+// customer.setFinishTime(tjOrder.getFinishTime());
+// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+// if (tjOrder.getFirmId() == null) {
+// customer.setTjCompName("鏃�");
+// } else {
+// DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
+// if (byId != null) {
+// customer.setTjCompName(byId.getCnName());
+// }
+// }
+// customerList.add(customer);
+// }
+// }
+// }
+// return customerList;
+// }
+//
+// //鏈
+// private List<TjCustomer> getWsResult(String config) {
+// List<TjOrder> orderList = null;
+// if("Y".equals(config)){
+// orderList = orderService.getCsTjOrderList1(null,0,null,null,null);
+// }else {
+// orderList = orderService.getTjOrderList(null,0,null,null,null);
+// }
+// List<TjCustomer> customerList = new ArrayList<>();
+// if(null !=orderList && orderList.size()>0) {
+// for (TjOrder tjOrder : orderList) {
+// if (null != tjOrder) {
+// TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+// if (customer == null) {
+// continue;
+// }
+// customer.setCusName(hideCusName(customer.getCusName()));
+// customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+// customer.setTjNumber(tjOrder.getTjNumber());
+// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+// customer.setOrderId(tjOrder.getOrderId());
+// customer.setTjTime(tjOrder.getCreateTime());
+// customer.setFinishTime(tjOrder.getFinishTime());
+// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+// if (tjOrder.getFirmId() == null) {
+// customer.setTjCompName("鏃�");
+// } else {
+// DictComp byId = compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId());
+// if (byId != null) {
+// customer.setTjCompName(byId.getCnName());
+// }
+// }
+// customerList.add(customer);
+// }
+// }
+// }
+// return customerList;
+// }
+//
+// private AjaxResult getAjaxResult(String tjNumber) {
+// List<Map<String, Object>> list = new ArrayList<>();
+// TjOrder one = orderService.getOrderByTjNum(tjNumber);
+//
+// if (one == null) {
+// return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+// }
+//
+// TjCustomer customer = tjCustomerService.getById(one.getUserId());
+// List<TjOrderRemark> remarkList = orderRemarkService.getRemarkListByTjNumAndType(tjNumber);
+//
+// if (null != remarkList && remarkList.size() > 0) {
+// for (TjOrderRemark remark : remarkList) {
+// Map<String, Object> parent = new HashMap<>();
+// parent.put("checkAdvice", one.getCheckAdvice());
+// TjProject project = projectService.selectTjProjectByProId(remark.getProId());
+// if (null != project) {
+// parent.put("parent", project.getProName());
+// parent.put("parentId", project.getProId().toString());
+// }
+// List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), remark.getProId());
+// if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+// for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+// final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+// tjOrderDetail.setProject(byId);
+// List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
+// if (list2.size() == 0) {
+// tjOrderDetail.setStandard(new TjStandard());
+// } else if (list2.size() == 1) {
+// tjOrderDetail.setStandard(list2.get(0));
+// } else {
+// final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
+// TjStandard tjStandard1=tjStandardService.getListBySexAndType(customer.getCusSex(),ageType, String.valueOf(tjOrderDetail.getProId()));
+// tjOrderDetail.setStandard(tjStandard1);
+// }
+// }
+// String summary = remark.getSummary();
+// if (null != summary) {
+// String[] split = summary.split(";");
+// parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split)));
+//
+// } else {
+// parent.put("parentAdvice", null);
+// }
+// parent.put("sons", tjOrderDetails);
+// parent.put("remark", remark.getRemark());
+//// if (remark.getDoctorName() != null && null != userService.getById(remark.getDoctorName())) {
+//// parent.put("doctorName", userService.getById(remark.getDoctorName()).getNickName());
+//// }
+// list.add(parent);
+// } else {
+// return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
+// }
+//// }
+// }
+// return AjaxResult.success(list);
+// }
+// return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");
+// }
+//
+// //宸茬鏀�/鏈鏀�
+// private List<Map<String, Object>> getYWqsResult(int a) {
+// LambdaQueryWrapper<TjSampling>wq=new LambdaQueryWrapper<>();
+// List<Map<String,Object>> arrayList=new ArrayList<>();
+// wq.orderByDesc(TjSampling::getApplicationTime);
+// wq.eq(TjSampling::getIsSignFor,a);
+// List<TjSampling> list = tjSamplingService.list(wq);
+// if(null != list && list.size()>0 ){
+// Map<String, List<TjSampling>> stringListMap = list.stream().collect(Collectors.groupingBy(TjSampling::getCusId));
+// for (Map.Entry<String, List<TjSampling>> entry : stringListMap.entrySet()) {
+// Map<String,Object>map=new HashMap<>();
+// TjCustomer customer = tjCustomerService.getById(entry.getKey());
+// if (customer==null){
+// continue;
+// }
+// customer.setCusName(hideCusName(customer.getCusName()));
+// customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+// customer.setTjNumber(entry.getValue().get(0).getTjNum());
+// customer.setApplicationTime(entry.getValue().get(0).getApplicationTime());
+// List<TjSampling> samplings = entry.getValue();
+// if(null !=samplings && samplings.size()>0){
+// List<TjSampling> projectList=new ArrayList<>();
+// for (TjSampling sampling : samplings) {
+// TjProject project = projectService.getById(sampling.getProId());
+// if(null !=project && project.getProParentId()==0){
+// projectList.add(sampling);
+// }
+// }
+// map.put("list",projectList);
+// }
+// map.put("customer",customer);
+// arrayList.add(map);
+// }
+// }
+// return arrayList;
+// }
+//
+//
+// /**
+// * 闅愯棌鎵嬫満鍙�
+// *
+// * @param phoneNum
+// * @return
+// */
+// public static String hidePhoneNum(String phoneNum){
+// if(phoneNum.contains("*")){
+// return phoneNum;
+// }
+// Pattern pattern = Pattern.compile("((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}");
+// Matcher matcher = pattern.matcher(phoneNum);
+// StringBuffer sb = new StringBuffer();
+// try {
+// while(matcher.find()) {
+// String phoneStr = matcher.group();
+// phoneStr = phoneStr.substring(0, 3) + "****" + phoneStr.substring(7, phoneStr.length());
+// matcher.appendReplacement(sb,phoneStr);
+// }
+// matcher.appendTail(sb);
+// } catch (Exception ex) {
+// ex.printStackTrace();
+// }
+// return sb.toString();
+// }
+//
+// /**
+// * 闅愯棌韬唤璇佸彿鐮�
+// *
+// * @param idCardNum
+// * @return
+// */
+// public static String hideIdCardNum(String idCardNum){
+// if(idCardNum.contains("*")){
+// return idCardNum;
+// }
+// Pattern pattern = Pattern.compile("(\\d{6})(19|20)(\\d{2})(1[0-2]|0[1-9])(0[1-9]|[1-2][0-9]|3[0-1])(\\d{3})(\\d|X|x)");
+// Matcher matcher = pattern.matcher(idCardNum);
+// StringBuffer sb = new StringBuffer();
+// try {
+// while(matcher.find()) {
+// String idCardStr = matcher.group();
+// int len=idCardStr.length();
+// if(len>=9){
+// idCardStr = idCardStr.replaceAll("(.{"+(len<12?3:6)+"})(.*)(.{4})", "$1" + "****" + "$3");
+// }
+// matcher.appendReplacement(sb,idCardStr);
+// }
+// matcher.appendTail(sb);
+// } catch (Exception ex) {
+// ex.printStackTrace();
+// }
+// return sb.toString();
+// }
+//
+//
+// /**
+// * 闅愯棌鐢ㄦ埛濮撳悕
+// *
+// * @param cusName
+// * @return
+// */
+// public static String hideCusName(String cusName){
+// if(!cusName.contains("*")){
+// String realname=null;
+// char[] r = cusName.toCharArray();
+// if(r.length ==1){
+// realname = cusName;
+// }
+// if(r.length == 2){
+// realname = cusName.replaceFirst(cusName.substring(1),"*");
+// }
+// if (r.length > 2) {
+// realname = cusName.replaceFirst(cusName.substring(1,r.length-1) ,"*");
+// }
+// return realname;
+// }
+// return cusName;
+// }
+//
+//
+// //涓存椂琛ㄦ坊鍔犲崟椤�
+// public void saveRedisTransitionByProId(String cusId, List<Long> proIds) {
+// for (Long proId : proIds) {
+// if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) && transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
+// continue;
+// }
+// transitionService.saveRedisTransitionByProId(cusId,proId);
+// }
+// }
+//}
--
Gitblit v1.8.0