From ec2bb08f0aad10bbf1f133046d8e9943be3a6d72 Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期三, 26 六月 2024 15:34:44 +0800 Subject: [PATCH] zjh 本地 2024/06/26 --3修改签到撤销接口不判断作废状态 --- ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 836 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 692 insertions(+), 144 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java index 4dca8d3..2280f9d 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java @@ -1,7 +1,10 @@ package com.ltkj.web.controller.service; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.common.core.domain.entity.SysUser; @@ -10,13 +13,20 @@ import com.ltkj.common.utils.StringUtils; import com.ltkj.framework.config.MatchUtils; import com.ltkj.hosp.domain.*; +import com.ltkj.hosp.hisDto.OutpinexamapplyDto; +import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto; +import com.ltkj.hosp.hisDto.OutpintestapplyDto; +import com.ltkj.hosp.hisDto.OutpintreatapplyDto; import com.ltkj.hosp.service.*; import com.ltkj.hosp.vodomain.AddNewReservationConfirm; import com.ltkj.hosp.vodomain.LineChartsVo; import com.ltkj.hosp.vodomain.PieChartVo; import com.ltkj.hosp.vodomain.QjDomainVo; import com.ltkj.mall.mallOrderUtils.TjConstants; +import com.ltkj.system.service.ISysConfigService; import com.ltkj.system.service.ISysUserService; +import com.ltkj.web.controller.his.HisApiGetMethodService; +import com.ltkj.web.controller.his.HisApiMethodService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -96,7 +106,22 @@ private IDictSfxmService dictSfxmService; @Autowired private ITjRulesService tjRulesService; - + @Autowired + private HisApiMethodService controller; + @Autowired + private HisApiConfigService hisApiConfigService; + @Autowired + private HisApiGetMethodService hisApiGetMethodService; + @Resource + private ISysConfigService configService; + @Autowired + private LtkjJfzhglmxjfxmzdService ltkjJfzhglmxjfxmzdService; + @Autowired + private LtkjMxjfxmzdService ltkjMxjfxmzdService; + @Autowired + private LtkjEjjfxmzdService ltkjEjjfxmzdService; + @Autowired + private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService; @Override public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) { @@ -238,7 +263,12 @@ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); } - transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber()); + if (tjFlowingWater.getDiscount() == null) { + transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber()); + } else { + transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber()); + } + tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId())); // List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId())); // if (list != null) { @@ -398,16 +428,20 @@ 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); - } +// 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); +// } +// LambdaQueryWrapper<TjOrderRemark> wq=new LambdaQueryWrapper<>(); +// wq.eq(TjOrderRemark::getTjNumber,tjNumber); +// wq.eq(TjOrderRemark::getProId,tjOrderDetail.getProId()); + orderRemarkService.updateTjOrderRemark(tjNumber, String.valueOf(tjOrderDetail.getProId())); //缁欏純妫�琛ㄦ坊鍔犺褰� TjDiscardInspection td = new TjDiscardInspection(); td.setProId(String.valueOf(one.getProId())); @@ -446,73 +480,178 @@ @Async("async") public void updateOrdeltile2(TjOrderDetail detail, SysUser sysUser) { // 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); + 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") + @Transactional public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) { + Date dates = new Date(); + final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss"); List<TjConsumables> list2 = new ArrayList<>(); String[] tjProIds = tjFlowingWater.getTjProIds(); + + String config = configService.selectConfigByKey("sfkqdyhis"); + + //妫�楠� + List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); + + //妫�鏌� + List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>(); + + + //澶勭疆 + List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>(); + + + List<TjProject> projectList=new ArrayList<>(); + 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()); - if ( proIds.size() > 0){ + TjProject project = projectService.getById(Long.valueOf(tjProId)); + if (null != project && project.getProParentId() == 0) { + 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(dates); + tjOrderRemark.setUpdateBy(sysUser.getNickName()); + tjOrderRemark.setUpdateTime(dates); + 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(dates); + detail.setUpdateBy(sysUser.getNickName()); + detail.setUpdateTime(dates); + 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(dates); + detail.setUpdateBy(sysUser.getNickName()); + detail.setUpdateTime(dates); + detail.setCreateId(String.valueOf(sysUser.getUserId())); + detail.setUpdateId(String.valueOf(sysUser.getUserId())); + tjOrderDetailService.save(detail1); + } wqq.in(TbTransition::getProId, proIds); + + if(null !=config && config.equals("Y")){ + //妫�楠� + if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L || project.getDeptId() == 317L)) { + if (null != project.getHisXmbm()) { + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(project.getHisXmbm()); + if (project.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(project.getSl()); + detailsDtos.add(detailsDto); + } + } + + //妫�鏌� + if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && + (project.getDeptId() == 247 || project.getDeptId() == 248 || project.getDeptId() == 249 || + project.getDeptId() == 250 || project.getDeptId() == 251 || project.getDeptId() == 252 || + project.getDeptId() == 271 || project.getDeptId() == 273 || project.getDeptId() == 274 || + project.getDeptId() == 275 || project.getDeptId() == 298)) { + if (null != project.getHisXmbm()) { + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(project.getHisXmbm()); + if (project.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(project.getSl()); + detailsDtoss.add(detailsDto); + } + } + + //澶勭疆 + if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && + (project.getDeptId() == 100 || project.getDeptId() == 240 || project.getDeptId() == 253 || + project.getDeptId() == 254 || project.getDeptId() == 255 || project.getDeptId() == 257 || + project.getDeptId() == 258 || project.getDeptId() == 259 || project.getDeptId() == 269 || + project.getDeptId() == 270)) { + if (null != project.getHisXmbm()) { + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(project.getHisXmbm()); + if (project.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(project.getSl()); + detailDtos.add(detailsDto); + } + } } + + + + } else { + wqq.in(TbTransition::getProId, Arrays.asList(tjProIds)); + TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId)); + if (null != projects) { + TjProject projectss = projectService.getById(projects.getProParentId()); + if (null != projectss && projectss.getProParentId()==0L) { + projectList.add(projectss); + } + } +// List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList()); + TjOrderDetail detail = new TjOrderDetail(); + detail.setTjStatus(0L); + detail.setOrderId(tjFlowingWater.getOrderId()); +// detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber())); + detail.setProId(Long.valueOf(tjProId)); + detail.setIsAddition("Y"); + detail.setCreateBy(sysUser.getNickName()); + detail.setCreateTime(dates); + detail.setUpdateBy(sysUser.getNickName()); + detail.setUpdateTime(dates); + detail.setCreateId(String.valueOf(sysUser.getUserId())); + detail.setUpdateId(String.valueOf(sysUser.getUserId())); + tjOrderDetailService.save(detail); + + } + List<TbTransition> tbTransitionList = transitionService.list(wqq); if (null != tbTransitionList && tbTransitionList.size() > 0) { for (TbTransition transition : tbTransitionList) { + transition.setTjNum(order.getTjNumber()); + transition.setCardId(order.getCardId()); transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10)))); transitionService.updateById(transition); TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId()); @@ -524,17 +663,18 @@ tjChargingStandard.setPrice(transition.getNowPrice()); tjChargingStandard.setProName(tjProject.getProName()); tjChargingStandard.setCreateBy(sysUser.getNickName()); - tjChargingStandard.setCreateTime(new Date()); + tjChargingStandard.setCreateTime(dates); tjChargingStandard.setUpdateBy(sysUser.getNickName()); - tjChargingStandard.setUpdateTime(new Date()); + tjChargingStandard.setUpdateTime(dates); tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId())); tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId())); chargingStandardService.save(tjChargingStandard); } } //鐖堕」 - TjProject parentProject = projectService.getById(tjProId); - if (null != parentProject) { + + TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId)); + if (null != parentProject && parentProject.getProParentId() == 0) { LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>(); wqqq.eq(TjProConsumables::getProId, parentProject.getProId()); List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq); @@ -544,9 +684,295 @@ list2.add(tjConsumables); } } + + } else { + TjProject parentProjects = projectService.getById(tjProId); + if (null != parentProjects) { + LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>(); + wqqq.eq(TjProConsumables::getProId, parentProjects.getProId()); + List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq); + if (null != proConsumables && proConsumables.size() > 0) { + for (TjProConsumables tjProConsumables : proConsumables) { + TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()); + list2.add(tjConsumables); + } + } + } } } } + + if(projectList.size()>0){ + List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList()); + for (TjProject project : list) { + TjOrderRemark tjOrderRemark = new TjOrderRemark(); + tjOrderRemark.setProId(project.getProId()); + tjOrderRemark.setProName(project.getProName()); + tjOrderRemark.setDeptId(project.getDeptId()); + tjOrderRemark.setTjNumber(order.getTjNumber()); + tjOrderRemark.setCreateBy(sysUser.getNickName()); + tjOrderRemark.setCreateTime(dates); + tjOrderRemark.setUpdateBy(sysUser.getNickName()); + tjOrderRemark.setUpdateTime(dates); + tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId())); + tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId())); + orderRemarkService.save(tjOrderRemark); + + TjOrderDetail detail1 = new TjOrderDetail(); + detail1.setTjStatus(0L); + detail1.setOrderId(tjFlowingWater.getOrderId()); +// detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber())); + detail1.setProId(project.getProId()); + detail1.setIsAddition("Y"); + detail1.setCreateBy(sysUser.getNickName()); + detail1.setCreateTime(dates); + detail1.setUpdateBy(sysUser.getNickName()); + detail1.setUpdateTime(dates); + detail1.setCreateId(String.valueOf(sysUser.getUserId())); + detail1.setUpdateId(String.valueOf(sysUser.getUserId())); + tjOrderDetailService.save(detail1); + if(null !=config && config.equals("Y")){ + //妫�楠� + if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L || project.getDeptId() == 317L)) { + if (null != project.getHisXmbm()) { + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + + detailsDto.setMxfyxmbm(project.getHisXmbm()); + + if (project.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(project.getSl()); + detailsDtos.add(detailsDto); + } + } + + //妫�鏌� + if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && + (project.getDeptId() == 247L || project.getDeptId() == 248L || project.getDeptId() == 249L || + project.getDeptId() == 250L || project.getDeptId() == 251L || project.getDeptId() == 252L || + project.getDeptId() == 271L || project.getDeptId() == 273L || project.getDeptId() == 274L || + project.getDeptId() == 275L || project.getDeptId() == 298L)) { + if (null != project.getHisXmbm()) { + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(project.getHisXmbm()); + if (project.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(project.getSl()); + detailsDtoss.add(detailsDto); + } + } + + //澶勭疆 + if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && + (project.getDeptId() == 100L || project.getDeptId() == 240L || project.getDeptId() == 253L || + project.getDeptId() == 254L || project.getDeptId() == 255L || project.getDeptId() == 257L || + project.getDeptId() == 258L || project.getDeptId() == 259L || project.getDeptId() == 269L || + project.getDeptId() == 270L)) { + if (null != project.getHisXmbm()) { + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(project.getHisXmbm()); + if (project.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(project.getSl()); + detailDtos.add(detailsDto); + } + } + } + } + } + + if(null !=config && config.equals("Y")){ + + + //妫�楠岀敵璇� + if(detailsDtos.size()>0){ + OutpintestapplyDto dto = new OutpintestapplyDto(); + dto.setHisRegistrationId(order.getCardId()); + dto.setSfzh(customer.getCusIdcard()); + dto.setSqysbm("00029"); + dto.setMzksbm("0101"); + dto.setSjrq(date); + dto.setCzybm("00029"); + dto.setCzyksbm("0101"); + dto.setSfjz("0"); + dto.setDetails(detailsDtos.stream().distinct().collect(Collectors.toList())); + AjaxResult ajaxResult1 = controller.Outpintestapply(dto); + String result5 = getAjaxResult(ajaxResult1); + JSONObject object3 = getJSONObject(result5); + String code3 = object3.getStr("ResultCode"); + if (code3.equals("0")) { + List<OutpintestapplyDetailsDto> details = dto.getDetails(); + for (OutpintestapplyDetailsDto detail : details) { + LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); + tree.setCardId(dto.getHisRegistrationId()); + LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>(); + wrapper4.eq(TjCustomer::getCardId, tree.getCardId()); + TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4); + tree.setPationid(tjCustomer.getPationId()); + JSONObject resultData = object3.getJSONObject("ResultData"); + tree.setSqdh(resultData.getStr("jysqdh")); + tree.setFyhj(resultData.getStr("fyhj")); + String mxfyxmbm = detail.getMxfyxmbm(); + tree.setHisXmdm(mxfyxmbm); + tree.setType("妫�楠�"); + LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); + List<TjProject> list = projectService.list(wrapper); + String tj_price = ""; + for (TjProject project : list) { + tj_price += project.getProPrice() + "銆�"; + } + tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1)); + LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); + if (detail.getSfzhfy().equals("1")) + wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); + else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); + List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); + if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { + String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); + LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); + wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); + LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); + LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); + wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); + LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); + tree.setXmfl(ejjfxmzd.getYjkmdm()); + } + ltkjJianchajianyanTreeService.save(tree); + } + + } + } + + //闂ㄨ瘖妫�鏌ョ敵璇� + if(detailsDtoss.size()>0){ + OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto(); + outpinexamapplyDto.setHisRegistrationId(order.getCardId()); + outpinexamapplyDto.setSfzh(customer.getCusIdcard()); + outpinexamapplyDto.setSqysbm("00029"); + outpinexamapplyDto.setMzksbm("0101"); + outpinexamapplyDto.setCzybm("00029"); + outpinexamapplyDto.setCzyksbm("0101"); + outpinexamapplyDto.setSfjz("0"); + outpinexamapplyDto.setDetails(detailsDtoss.stream().distinct().collect(Collectors.toList())); + AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto); + String result6 = getAjaxResult(ajaxResult2); + JSONObject object5 = getJSONObject(result6); + String code4 = object5.getStr("ResultCode"); + if (code4.equals("0")) { + List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails(); + for (OutpintestapplyDetailsDto detail : details) { + LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); + tree.setCardId(outpinexamapplyDto.getHisRegistrationId()); + LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>(); + wrapper4.eq(TjCustomer::getCardId, tree.getCardId()); + TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4); + tree.setPationid(tjCustomer.getPationId()); + JSONObject resultData = object5.getJSONObject("ResultData"); + tree.setSqdh(resultData.getStr("jcsqdh")); + tree.setFyhj(resultData.getStr("fyhj")); + String mxfyxmbm = detail.getMxfyxmbm(); + tree.setHisXmdm(mxfyxmbm); + tree.setType("妫�鏌�"); + LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); + List<TjProject> list = projectService.list(wrapper); + String tj_price = ""; + for (TjProject project : list) { + tj_price += project.getProPrice() + "銆�"; + } + tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1)); + LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); + if (detail.getSfzhfy().equals("1")) + wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); + else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); + List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); + if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { + String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); + LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); + wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); + LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); + LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); + wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); + LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); + tree.setXmfl(ejjfxmzd.getYjkmdm()); + } + ltkjJianchajianyanTreeService.save(tree); + } + } + } + + + //闂ㄨ瘖娌荤枟澶勭疆鐢宠 + if(detailDtos.size()>0){ + OutpintreatapplyDto dao = new OutpintreatapplyDto(); + dao.setHisRegistrationId(order.getCardId()); + dao.setSfzh(customer.getCusIdcard()); + dao.setSqysbm("00029"); + dao.setMzksbm("0101"); + dao.setSjrq(date); + dao.setCzybm("00029"); + dao.setCzyksbm("0101"); + dao.setSfjz("0"); + dao.setDetails(detailDtos.stream().distinct().collect(Collectors.toList())); + AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao); + String mzylyzsq2 = getAjaxResult(mzylyzsq1); + JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2); + String code5 = mzylyzsq3.getStr("ResultCode"); + if (code5.equals("0")) { + List<OutpintestapplyDetailsDto> details1 = dao.getDetails(); + for (OutpintestapplyDetailsDto detail : details1) { + LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); + tree.setCardId(dao.getHisRegistrationId()); + LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>(); + wrapper4.eq(TjCustomer::getCardId, tree.getCardId()); + TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4); + tree.setPationid(tjCustomer.getPationId()); + JSONObject resultData = mzylyzsq3.getJSONObject("ResultData"); + tree.setSqdh(resultData.getStr("zlczh")); + tree.setFyhj(resultData.getStr("fyhj")); + String mxfyxmbm = detail.getMxfyxmbm(); + tree.setHisXmdm(mxfyxmbm); + tree.setType("澶勭疆"); + LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); + List<TjProject> list = projectService.list(wrapper); + String tj_price = ""; + for (TjProject project : list) { + tj_price += project.getProPrice() + "銆�"; + } + tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1)); + LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); + if (detail.getSfzhfy().equals("1")) + wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); + else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); + List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); + if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { + String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); + LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); + wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); + LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); + LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); + wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); + LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); + tree.setXmfl(ejjfxmzd.getYjkmdm()); + } + ltkjJianchajianyanTreeService.save(tree); + } + } + } + } + + //鐖堕」鑰楁潗 ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new)); for (TjConsumables tjConsumables : collect) { @@ -558,9 +984,9 @@ tjChargingStandard.setConsumablesName(tjConsumables.getMakings()); tjChargingStandard.setCompany(tjConsumables.getSpecifications()); tjChargingStandard.setCreateBy(sysUser.getNickName()); - tjChargingStandard.setCreateTime(new Date()); + tjChargingStandard.setCreateTime(dates); tjChargingStandard.setUpdateBy(sysUser.getNickName()); - tjChargingStandard.setUpdateTime(new Date()); + tjChargingStandard.setUpdateTime(dates); tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId())); tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId())); chargingStandardService.save(tjChargingStandard); @@ -579,17 +1005,17 @@ @Override @Async("async") - public void dockerSetYjCustomerByRedis(Long orderId,Long ksId) { + public void dockerSetYjCustomerByRedis(Long orderId, Long ksId) { //宸叉(鍗曚釜瀛樺叆)0鏈,1宸叉 - getDgYjAjaxResult(orderId,ksId); + getDgYjAjaxResult(orderId, ksId); } @Override @Async("async") - public void dockerSetWjCustomerByRedis(Long orderId,Long ksId) { + public void dockerSetWjCustomerByRedis(Long orderId, Long ksId) { //鏈(鍗曚釜瀛樺叆)0鏈,1宸叉 - getDgWjAjaxResult(orderId,ksId); + getDgWjAjaxResult(orderId, ksId); } @Override @@ -704,7 +1130,9 @@ @Override @Async("async") public void tjGoutAsync(List<QjDomainVo> domainVos, SysUser sysUser, Set<String> list) { + Integer day = 0; for (QjDomainVo domainVo : domainVos) { + day = domainVo.getDay(); TjOrderRemark remark = orderRemarkService.getById(domainVo.getRemarkId()); TjOrder order = orderService.getOrderByTjNum(domainVo.getTjNumber()); //缁欏純妫�琛ㄦ坊鍔犺褰� @@ -747,13 +1175,14 @@ } } if (list.size() > 0) { + Date date = new Date(); 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.setUpdateTime(date); tjOrder.setUpdateId(String.valueOf(sysUser.getUserId())); orderService.updateById(tjOrder); TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId()); @@ -763,15 +1192,15 @@ yqOrder.setSex(String.valueOf(customer.getCusSex())); yqOrder.setAge(customer.getAge()); yqOrder.setPhone(customer.getCusPhone()); - yqOrder.setYqTime(new Date()); + yqOrder.setYqTime(DateUtil.offsetDay(date, day)); yqOrder.setOrderTime(tjOrder.getCreateTime()); yqOrder.setProIds(orderRemarkService.getTjOrderRemarkProIdList(s)); yqOrder.setEmilSend("0"); yqOrder.setMsgSend("0"); yqOrder.setCreateBy(sysUser.getNickName()); - yqOrder.setCreateTime(new DateTime()); + yqOrder.setCreateTime(date); yqOrder.setUpdateBy(sysUser.getNickName()); - yqOrder.setUpdateTime(new DateTime()); + yqOrder.setUpdateTime(date); yqOrder.setCreateId(String.valueOf(sysUser.getUserId())); yqOrder.setUpdateId(String.valueOf(sysUser.getUserId())); yqOrderService.save(yqOrder); @@ -821,12 +1250,12 @@ @Override @Async("async") - public void saveRedisTransitionByPacId(String cusId, Long pacId, List<Long> proIds) { + public void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId, List<Long> proIds) { if (null != pacId) { - transitionService.saveRedisTransitionByPacId(cusId, pacId); + transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId); } if (null != proIds && proIds.size() > 0) { - saveRedisTransitionByProId(cusId, proIds); + saveRedisTransitionByProId(cusId,cardId, proIds); } } @@ -992,6 +1421,108 @@ @Async("async") public void getPieChart() { redisCache.setCacheObject("getPieChart", getPieCharts()); + } + + @Override + public void addTjChargingStandard(TjOrder order, List<TbTransition> tbTransitionList, SysUser sysUser) { + List<TjConsumables> list2 = new ArrayList<>(); + for (TbTransition transition : tbTransitionList) { + + if (transition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) { + continue; + } + + 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); + } + } + } + } + } + + 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); + } + } } //棣栭〉楗肩姸鍥剧櫥璁颁汉鏁版帴鍙� @@ -1324,10 +1855,10 @@ } LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>(); qww.eq(TjOrderDetail::getOrderId, order.getOrderId()); - qww.eq(TjOrderDetail::getTjStatus,0); + qww.eq(TjOrderDetail::getTjStatus, 0); qww.isNotNull(TjOrderDetail::getFlowingWaterId); List<TjOrderDetail> lists = tjOrderDetailService.list(qww); - if (null != lists&&lists.size()>0) { + if (null != lists && lists.size() > 0) { continue; } @@ -1336,7 +1867,7 @@ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪 for (TjOrderDetail tjOrderDetail11 : lists) { customer.setIsPositive(tjOrderDetail11.getIsPositive()); - if (tjOrderDetail11.getIsPositive()==1){ + if (tjOrderDetail11.getIsPositive() == 1) { break; } } @@ -1412,7 +1943,7 @@ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪 for (TjOrderDetail tjOrderDetail11 : lists) { customer.setIsPositive(tjOrderDetail11.getIsPositive()); - if (tjOrderDetail11.getIsPositive()==1){ + if (tjOrderDetail11.getIsPositive() == 1) { break; } } @@ -1442,7 +1973,10 @@ StringBuilder stringBuilder = new StringBuilder(); for (TjOrderRemark remark : list) { TjProject byId = projectService.getById(remark.getProId()); - stringBuilder.append(byId.getProName()).append(";"); + if (null != byId) { + stringBuilder.append(byId.getProName()).append(";"); + } + } customer.setNotCheckeds(String.valueOf(stringBuilder)); if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉"); @@ -1457,7 +1991,7 @@ } //宸叉(鍗曚釜瀛樺叆)0鏈,1宸叉 - public void getDgYjAjaxResult(Long orderId,Long ksId) { + public void getDgYjAjaxResult(Long orderId, Long ksId) { if (null != orderId) { TjOrder order = orderService.getById(orderId); if (null != order) { @@ -1468,8 +2002,8 @@ TjCustomer customer = tjCustomerService.getById(order.getUserId()); List<TjOrderDetail> lists = tjOrderDetailService.list(qww); if (null == lists || lists.size() == 0) { - redisCache.deleteCacheMapValue("ks"+ksId+customer.getCusId(),"1"); - redisCache.setCacheMapValue("ks:"+ksId+":"+customer.getCusId(),"0",customer); + redisCache.deleteCacheMapValue("ks" + ksId + customer.getCusId(), "1"); + redisCache.setCacheMapValue("ks:" + ksId + ":" + customer.getCusId(), "0", customer); } if (null != customer) { //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪 @@ -1507,67 +2041,67 @@ customer.setNotCheckeds(String.valueOf(stringBuilder)); if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉"); } - redisCache.setCacheMapValue("ks:"+ksId+":"+customer.getCusId(),"1",customer); + redisCache.setCacheMapValue("ks:" + ksId + ":" + customer.getCusId(), "1", customer); } } } -} + } //鏈(鍗曚釜瀛樺叆)0鏈,1宸叉 - public void getDgWjAjaxResult(Long orderId,Long ksId) { - if (null != orderId) { - TjOrder order = orderService.getById(orderId); - if (null == order) { - TjCustomer customer = tjCustomerService.getById(order.getUserId()); - if (null != customer) { - LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>(); - qww.eq(TjOrderDetail::getOrderId, order.getOrderId()); - qww.isNotNull(TjOrderDetail::getFlowingWaterId); - List<TjOrderDetail> lists = tjOrderDetailService.list(qww); - if (null != lists) { - //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪 - for (TjOrderDetail tjOrderDetail11 : lists) { - customer.setIsPositive(tjOrderDetail11.getIsPositive()); - if (tjOrderDetail11.getIsPositive()==1){ - break; - } + public void getDgWjAjaxResult(Long orderId, Long ksId) { + if (null != orderId) { + TjOrder order = orderService.getById(orderId); + if (null == order) { + TjCustomer customer = tjCustomerService.getById(order.getUserId()); + if (null != customer) { + LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>(); + qww.eq(TjOrderDetail::getOrderId, order.getOrderId()); + qww.isNotNull(TjOrderDetail::getFlowingWaterId); + List<TjOrderDetail> lists = tjOrderDetailService.list(qww); + if (null != lists) { + //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪 + for (TjOrderDetail tjOrderDetail11 : lists) { + customer.setIsPositive(tjOrderDetail11.getIsPositive()); + if (tjOrderDetail11.getIsPositive() == 1) { + break; } } - - 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.setOrderId(order.getOrderId()); - customer.setIsHz(order.getIsHz()); - customer.setTjCategory(order.getTjCategory()); - 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("鍏ㄩ儴宸叉"); - } -// redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"1",customer); - redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"0",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.setOrderId(order.getOrderId()); + customer.setIsHz(order.getIsHz()); + customer.setTjCategory(order.getTjCategory()); + 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("鍏ㄩ儴宸叉"); + } +// redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"1",customer); + redisCache.setCacheMapValue("ks" + ksId + ":" + customer.getCusId(), "0", customer); } + } } } @@ -1653,6 +2187,17 @@ } } return customerList; + } + + //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡 + public JSONObject getJSONObject(String builder) { + String Response = JSONUtil.parseObj(builder).getStr("Response"); + return JSONUtil.parseObj(Response); + } + + //鑾峰彇鏂规硶杩斿洖鍊间俊鎭� + public String getAjaxResult(AjaxResult result) { + return result.get("data").toString(); } //鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏 @@ -1847,13 +2392,16 @@ } //涓存椂琛ㄦ坊鍔犲崟椤� - public void saveRedisTransitionByProId(String cusId, List<Long> proIds) { + public void saveRedisTransitionByProId(String cusId,String cardId, List<Long> proIds) { for (Long proId : proIds) { - List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); - if (null != transitionList && transitionList.size() > 0) { - continue; + TjProject project = projectService.selectTjProjectByProId(proId); + if(null !=project && (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))){ + List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); + if (null != transitionList && transitionList.size() > 0) { + continue; + } } - transitionService.saveRedisTransitionByProId(cusId, proId); + transitionService.saveRedisTransitionByProId(cusId,cardId, proId); } } -- Gitblit v1.8.0